diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/LnService.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/LnService.java
index 74aef2e46..964404623 100644
--- a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/LnService.java
+++ b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/LnService.java
@@ -9,16 +9,20 @@
 import org.lfenergy.compas.scl2007b4.model.*;
 import org.lfenergy.compas.sct.commons.api.LnEditor;
 import org.lfenergy.compas.sct.commons.domain.*;
+import org.lfenergy.compas.sct.commons.dto.SclReportItem;
+import org.lfenergy.compas.sct.commons.scl.ldevice.LDeviceActivation;
+import org.lfenergy.compas.sct.commons.scl.ln.LnId;
 import org.lfenergy.compas.sct.commons.util.ActiveStatus;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 import java.util.function.Predicate;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static org.lfenergy.compas.sct.commons.util.CommonConstants.MOD_DO_NAME;
-import static org.lfenergy.compas.sct.commons.util.CommonConstants.STVAL_DA_NAME;
+import static org.lfenergy.compas.sct.commons.util.CommonConstants.*;
 import static org.lfenergy.compas.sct.commons.util.SclConstructorHelper.newVal;
 
 @Slf4j
@@ -146,6 +150,77 @@ public void updateOrCreateDOAndDAInstances(TAnyLN tAnyLN, DoLinkedToDa doLinkedT
                 });
     }
 
+    /**
+     * Activate used LDevice and Deactivate unused LDevice in {@link TLNode <em><b>TLNode </b></em>}
+     *
+     * @param scd SCL file for which LDevice should be activated or deactivated
+     * @return list of encountered errors
+     */
+    public List<SclReportItem> updateLDeviceStatus(SCL scd, SubstationService substationService, LdeviceService ldeviceService, DataTypeTemplatesService dataTypeTemplatesService) {
+        List<SclReportItem> sclReportItems = new ArrayList<>();
+        scd.getIED().forEach(tied -> ldeviceService.getLdevices(tied)
+                .forEach(tlDevice -> getAnylns(tlDevice)
+                        .forEach(tln -> {
+                            String xpath = "/SCL/IED[@name=%s]/AccessPoint/Server/LDevice[@inst=%s]/LN[class=%s]".formatted(tied.getName(), tlDevice.getInst(), LnId.from(tln).lnClass());
+                            DoLinkedToDaFilter doLinkedToDaFilter = DoLinkedToDaFilter.from(BEHAVIOUR_DO_NAME, STVAL_DA_NAME);
+                            Optional<DoLinkedToDa> optionalBehStVal = dataTypeTemplatesService.getFilteredDoLinkedToDa(scd.getDataTypeTemplates(), tln.getLnType(), doLinkedToDaFilter).findFirst();
+                            if (optionalBehStVal.isEmpty()) {
+                                sclReportItems.add(SclReportItem.error(xpath, "The LDevice doesn't have a DO @name='Beh'"));
+                                return;
+                            }
+
+                            Optional<ActiveStatus> modStValOptional = getDaiModStValValue(tln);
+                            if (modStValOptional.isEmpty()) {
+                                sclReportItems.add(SclReportItem.error(xpath, "The LDevice doesn't have a DO @name='Mod'"));
+                                return;
+                            }
+
+                            Set<String> enumValues = dataTypeTemplatesService.getEnumValues(scd.getDataTypeTemplates(), tln.getLnType(), doLinkedToDaFilter).collect(Collectors.toSet());
+                            if (!enumValues.contains(ActiveStatus.ON.getValue()) && !enumValues.contains(ActiveStatus.OFF.getValue())) {
+                                sclReportItems.add(SclReportItem.error(xpath, "The LDevice cannot be activated or desactivated because its BehaviourKind Enum contains NOT 'on' AND NOT 'off'."));
+                                return;
+                            }
+
+                            Optional<TLNode> tlNodeOptional = substationService.getLNodes(scd).stream().filter(tlNode1 -> tlNode1.isSetIedName() && tlNode1.isSetLdInst())
+                                    .filter(tlNode -> tlNode.getIedName().equals(tied.getName()) && tlNode.getLdInst().equals(tlDevice.getInst()))
+                                    .findFirst();
+
+                            LDeviceActivation lDeviceStatusActivation = new LDeviceActivation(modStValOptional.get().getValue(), tlNodeOptional.isPresent(), enumValues, tln);
+                            activateOrDeactivateLDeviceStatus(lDeviceStatusActivation, xpath, sclReportItems);
+                        })));
+        return sclReportItems;
+    }
+
+    private void activateOrDeactivateLDeviceStatus(LDeviceActivation lDeviceStatusActivation, String xpath, List<SclReportItem> sclReportItems) {
+        if(lDeviceStatusActivation.isPresentInSubstation()){
+            // Activate LDevice
+            if(lDeviceStatusActivation.enumValues().contains(ActiveStatus.ON.getValue())) {
+                update(lDeviceStatusActivation.tln(), lDeviceStatusActivation.modStValCurrentValue(), ActiveStatus.ON.getValue());
+            }else {
+                sclReportItems.add(SclReportItem.error(xpath, "The LDevice cannot be set to 'on' but has been selected into SSD."));
+            }
+        } else {
+            // Deactivate LDevice
+            if(lDeviceStatusActivation.enumValues().contains(ActiveStatus.OFF.getValue())) {
+                update(lDeviceStatusActivation.tln(), lDeviceStatusActivation.modStValCurrentValue(), ActiveStatus.OFF.getValue());
+            }else {
+                sclReportItems.add(SclReportItem.error(xpath, "The LDevice cannot be set to 'off' but it has not been selected into SSD."));
+            }
+        }
+    }
+
+    private void update(TAnyLN tAnyLN, String modStValValue, String modStValNewVal) {
+        if (!modStValValue.equals(modStValNewVal)) {
+            DataObject dataObject = new DataObject();
+            dataObject.setDoName(MOD_DO_NAME);
+            DataAttribute dataAttribute = new DataAttribute();
+            dataAttribute.setDaName(STVAL_DA_NAME);
+            dataAttribute.setDaiValues(List.of(new DaVal(null, modStValNewVal)));
+            DoLinkedToDa doLinkedToDa = new DoLinkedToDa(dataObject, dataAttribute);
+            updateOrCreateDOAndDAInstances(tAnyLN, doLinkedToDa);
+         }
+    }
+
     public void completeFromDAInstance(TIED tied, String ldInst, TAnyLN anyLN, DoLinkedToDa doLinkedToDa) {
         getDOAndDAInstances(anyLN, doLinkedToDa.toFilter())
                 .ifPresent(tdai -> {
diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/SclService.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/SclService.java
index 006075c87..b08a98cab 100644
--- a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/SclService.java
+++ b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/SclService.java
@@ -6,7 +6,6 @@
 
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.tuple.Pair;
 import org.lfenergy.compas.scl2007b4.model.*;
 import org.lfenergy.compas.sct.commons.api.SclEditor;
 import org.lfenergy.compas.sct.commons.dto.*;
@@ -187,19 +186,6 @@ public void importSTDElementsInSCD(SCL scd, List<SCL> stds) throws ScdException
                 });
     }
 
-    @Override
-    public List<SclReportItem> updateLDeviceStatus(SCL scd) {
-        SclRootAdapter sclRootAdapter = new SclRootAdapter(scd);
-        SubstationAdapter substationAdapter = sclRootAdapter.getSubstationAdapter();
-        final List<Pair<String, String>> iedNameLdInstList = substationAdapter.getIedAndLDeviceNamesForLN0FromLNode();
-        return sclRootAdapter.streamIEDAdapters()
-                .flatMap(IEDAdapter::streamLDeviceAdapters)
-                .map(LDeviceAdapter::getLN0Adapter)
-                .map(ln0Adapter -> ln0Adapter.updateLDeviceStatus(iedNameLdInstList))
-                .flatMap(Optional::stream)
-                .toList();
-    }
-
     @Override
     public List<SclReportItem> updateDoInRef(SCL scd) {
         SclRootAdapter sclRootAdapter = new SclRootAdapter(scd);
diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/SubstationService.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/SubstationService.java
index 6936955ec..a4e5ffc2f 100644
--- a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/SubstationService.java
+++ b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/SubstationService.java
@@ -6,12 +6,15 @@
 
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
-import org.lfenergy.compas.scl2007b4.model.SCL;
-import org.lfenergy.compas.scl2007b4.model.TBay;
-import org.lfenergy.compas.scl2007b4.model.TSubstation;
-import org.lfenergy.compas.scl2007b4.model.TVoltageLevel;
+import org.apache.commons.lang3.tuple.Pair;
+import org.lfenergy.compas.scl2007b4.model.*;
 import org.lfenergy.compas.sct.commons.api.SubstationEditor;
 import org.lfenergy.compas.sct.commons.exception.ScdException;
+import org.lfenergy.compas.sct.commons.scl.sstation.BayAdapter;
+import org.lfenergy.compas.sct.commons.scl.sstation.VoltageLevelAdapter;
+
+import java.util.List;
+import java.util.stream.Collectors;
 
 @RequiredArgsConstructor
 public class SubstationService implements SubstationEditor {
@@ -42,6 +45,21 @@ public void addSubstation(@NonNull SCL scd, @NonNull SCL ssd) throws ScdExceptio
         }
     }
 
+    /**
+     * Gets a pair of IedName and LDevice inst from Substation LNodes for LN0 type object
+     * @return a pair of Ied name and LDevice inst attributes
+     */
+    public List<TLNode> getLNodes(SCL scd) {
+        return scd.getSubstation().getFirst()
+                .getVoltageLevel().stream()
+                .flatMap(tVoltageLevel -> tVoltageLevel.getBay().stream())
+                .flatMap(tBay -> tBay.getFunction().stream())
+                .flatMap(tFunction -> tFunction.getLNode().stream())
+                .filter(tlNode -> tlNode.getLnClass().contains(TLLN0Enum.LLN_0.value()))
+                .toList();
+    }
+
+
     /**
      * Creates new VoltageLevel section or updates VoltageLevel contents
      * @param scd SCL contain Substation in which VoltageLevel should be created/updated
diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/api/SclEditor.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/api/SclEditor.java
index 1040f0ea0..75956c7e4 100644
--- a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/api/SclEditor.java
+++ b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/api/SclEditor.java
@@ -6,7 +6,6 @@
 
 import lombok.NonNull;
 import org.lfenergy.compas.scl2007b4.model.SCL;
-import org.lfenergy.compas.scl2007b4.model.TLNode;
 import org.lfenergy.compas.sct.commons.dto.*;
 import org.lfenergy.compas.sct.commons.exception.ScdException;
 
@@ -137,13 +136,6 @@ public interface SclEditor {
      */
     void importSTDElementsInSCD(SCL scd, List<SCL> stds) throws ScdException;
 
-    /**
-     * Activate used LDevice and Deactivate unused LDevice in {@link TLNode <em><b>TLNode </b></em>}
-     *
-     * @param scd SCL file for which LDevice should be activated or deactivated
-     * @return list of encountered errors
-     */
-    List<SclReportItem> updateLDeviceStatus(SCL scd);
 
     /**
      * Update DAIs of DO InRef in all LN0 of the SCD using matching ExtRef information.
diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/ldevice/LDeviceActivation.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/ldevice/LDeviceActivation.java
index 284c3c863..c3cfec736 100644
--- a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/ldevice/LDeviceActivation.java
+++ b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/ldevice/LDeviceActivation.java
@@ -1,122 +1,12 @@
-// SPDX-FileCopyrightText: 2022 RTE FRANCE
+// SPDX-FileCopyrightText: 2025 RTE FRANCE
 //
 // SPDX-License-Identifier: Apache-2.0
 
 package org.lfenergy.compas.sct.commons.scl.ldevice;
 
-import lombok.Getter;
-import lombok.Setter;
-import org.apache.commons.lang3.tuple.Pair;
-import org.lfenergy.compas.scl2007b4.model.TCompasLDeviceStatus;
-import org.lfenergy.compas.sct.commons.util.ActiveStatus;
+import org.lfenergy.compas.scl2007b4.model.TAnyLN;
 
-import java.util.List;
 import java.util.Set;
 
-/**
- * Common class for all states that define if LDevice should be activated or not
- * regardless of the CompasLDeviceStatus Private, Enum Values of DO 'Beh' and if it's referenced in Substation...LNode or not
- */
-@Getter
-@Setter
-public class LDeviceActivation {
-
-    private final List<Pair<String, String>> iedNameLdInstList;
-    private boolean isUpdatable;
-    private String newVal;
-    private String errorMessage;
-
-    public LDeviceActivation(List<Pair<String, String>> iedNameLdInstList) {
-        this.iedNameLdInstList = iedNameLdInstList;
-    }
-
-    /**
-     * checks whether LDevice status is authorized to be activated or Not
-     * @param iedName Ied name value which LDevice appear
-     * @param ldInst LDevice inst value
-     * @param compasLDeviceStatus Private value
-     * @param enumValues enum values
-     */
-    public void checkLDeviceActivationStatus(String iedName, String ldInst, TCompasLDeviceStatus compasLDeviceStatus, Set<String> enumValues) {
-        if (!enumValues.contains(ActiveStatus.ON.getValue()) && !enumValues.contains(ActiveStatus.OFF.getValue())) {
-            errorMessage = "The LDevice cannot be activated or desactivated because its BehaviourKind Enum contains NOT 'on' AND NOT 'off'.";
-        }
-        if (!enumValues.contains(ActiveStatus.ON.getValue()) && enumValues.contains(ActiveStatus.OFF.getValue())) {
-            if (isDeclaredInSubstation(iedName, ldInst)) {
-                errorMessage = "The LDevice cannot be set to 'on' but has been selected into SSD.";
-            } else {
-                isUpdatable = true;
-                newVal = ActiveStatus.OFF.getValue();
-            }
-        }
-        if(compasLDeviceStatus.equals(TCompasLDeviceStatus.ACTIVE) ||
-                compasLDeviceStatus.equals(TCompasLDeviceStatus.UNTESTED)){
-            checkAuthorisationToActivateLDevice(iedName, ldInst, enumValues);
-        }
-        if(compasLDeviceStatus.equals(TCompasLDeviceStatus.INACTIVE)){
-            checkAuthorisationToDeactivateLDevice(iedName, ldInst, enumValues);
-        }
-    }
-
-    /**
-     * checks whether LDevice status is authorized to be activated when CompasLDeviceStatus Private is ACTIVE or UNTESTED
-     * @param iedName Ied name value which contains LDevice
-     * @param ldInst LDevice inst value
-     * @param enumValues enum values
-     */
-    private void checkAuthorisationToActivateLDevice(String iedName, String ldInst, Set<String> enumValues) {
-        if (!enumValues.contains(ActiveStatus.OFF.getValue()) && enumValues.contains(ActiveStatus.ON.getValue())) {
-            if (isDeclaredInSubstation(iedName, ldInst)) {
-                isUpdatable = true;
-                newVal = ActiveStatus.ON.getValue();
-            } else {
-                errorMessage = "The LDevice cannot be set to 'off' but has not been selected into SSD.";
-            }
-        }
-        if (enumValues.contains(ActiveStatus.ON.getValue()) && enumValues.contains(ActiveStatus.OFF.getValue())) {
-            isUpdatable = true;
-            if (isDeclaredInSubstation(iedName, ldInst)) {
-                newVal = ActiveStatus.ON.getValue();
-            } else {
-                newVal = ActiveStatus.OFF.getValue();
-            }
-        }
-
-    }
-
-    /**
-     * checks whether LDevice Status is authorized to be deactivated when CompasLDeviceStatus Private is INACTIVE
-     * @param iedName Ied name value which contains LDevice
-     * @param ldInst LDevice inst value
-     * @param enumValues enum values
-     */
-    private void checkAuthorisationToDeactivateLDevice(String iedName, String ldInst, Set<String> enumValues) {
-        if (!enumValues.contains(ActiveStatus.OFF.getValue()) && enumValues.contains(ActiveStatus.ON.getValue())) {
-            if (isDeclaredInSubstation(iedName, ldInst)) {
-                errorMessage = "The LDevice is not qualified into STD but has been selected into SSD.";
-            } else {
-                errorMessage = "The LDevice cannot be set to 'off' but has not been selected into SSD.";
-            }
-        }
-        if (enumValues.contains(ActiveStatus.ON.getValue()) && enumValues.contains(ActiveStatus.OFF.getValue())) {
-            if (isDeclaredInSubstation(iedName, ldInst)) {
-                errorMessage = "The LDevice is not qualified into STD but has been selected into SSD.";
-            } else {
-                isUpdatable = true;
-                newVal = ActiveStatus.OFF.getValue();
-            }
-        }
-    }
-
-    /**
-     * checks whether a pair of IED name and LDevice inst are referenced in Substation...LNode list
-     * @param iedName Ied name value
-     * @param ldInst LDevice inst value
-     * @return Returns whether a pair of IED name and LDevice inst are referenced in Substation...LNode list
-     */
-    private boolean isDeclaredInSubstation(String iedName, String ldInst){
-        return iedNameLdInstList.contains(Pair.of(iedName, ldInst));
-    }
-
-
+public record LDeviceActivation(String modStValCurrentValue, boolean isPresentInSubstation, Set<String> enumValues, TAnyLN tln) {
 }
diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/ln/LN0Adapter.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/ln/LN0Adapter.java
index 09836f9cc..f3f1fc837 100644
--- a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/ln/LN0Adapter.java
+++ b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/ln/LN0Adapter.java
@@ -10,7 +10,6 @@
 import org.lfenergy.compas.sct.commons.dto.*;
 import org.lfenergy.compas.sct.commons.scl.ObjectReference;
 import org.lfenergy.compas.sct.commons.scl.ied.InputsAdapter;
-import org.lfenergy.compas.sct.commons.scl.ldevice.LDeviceActivation;
 import org.lfenergy.compas.sct.commons.scl.ldevice.LDeviceAdapter;
 import org.lfenergy.compas.sct.commons.util.PrivateUtils;
 
@@ -176,7 +175,7 @@ public void removeAllControlBlocksAndDatasets() {
      * @return Set of Errors
      */
     public Optional<SclReportItem> updateLDeviceStatus(List<Pair<String, String>> iedNameLDeviceInstList) {
-        LDeviceActivation lDeviceActivation = new LDeviceActivation(iedNameLDeviceInstList);
+//        LDeviceActivation lDeviceActivation = new LDeviceActivation(iedNameLDeviceInstList);
         final String iedName = getParentAdapter().getParentAdapter().getName();
         final String ldInst = getParentAdapter().getInst();
         DataAttributeRef daiBehFilter = new DataAttributeRef(this, BEHAVIOUR_DO_TYPE_NAME, BEHAVIOUR_DA_TYPE_NAME);
@@ -199,20 +198,21 @@ public Optional<SclReportItem> updateLDeviceStatus(List<Pair<String, String>> ie
         }
         DataAttributeRef newDaModToSetInLN0 = optionalModStVal.get();
         String initialValue = newDaModToSetInLN0.findFirstValue().orElse("");
-        lDeviceActivation.checkLDeviceActivationStatus(iedName, ldInst, compasLDeviceStatus, enumValues);
-        if (lDeviceActivation.isUpdatable()) {
-            if (!initialValue.equals(lDeviceActivation.getNewVal())) {
-                newDaModToSetInLN0.setVal(lDeviceActivation.getNewVal());
-                updateDAI(newDaModToSetInLN0);
-            }
-        } else {
-            if (lDeviceActivation.getErrorMessage() != null) {
-                return Optional.of(buildFatalReportItem(lDeviceActivation.getErrorMessage()));
-            }
-        }
+//        lDeviceActivation.checkLDeviceActivationStatus(iedName, ldInst, compasLDeviceStatus, enumValues);
+//        if (lDeviceActivation.isUpdatable()) {
+//            if (!initialValue.equals(lDeviceActivation.getNewVal())) {
+//                newDaModToSetInLN0.setVal(lDeviceActivation.getNewVal());
+//                updateDAI(newDaModToSetInLN0);
+//            }
+//        } else {
+//            if (lDeviceActivation.getErrorMessage() != null) {
+//                return Optional.of(buildFatalReportItem(lDeviceActivation.getErrorMessage()));
+//            }
+//        }
         return Optional.empty();
     }
 
+
     private static DaTypeName getDaTypeNameForBeh() {
         DaTypeName daTypeNameBeh = new DaTypeName();
         daTypeNameBeh.setName(STVAL_DA_NAME);
diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/sstation/SubstationAdapter.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/sstation/SubstationAdapter.java
index 02d9ce17c..1b68bc99f 100644
--- a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/sstation/SubstationAdapter.java
+++ b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/sstation/SubstationAdapter.java
@@ -4,17 +4,13 @@
 
 package org.lfenergy.compas.sct.commons.scl.sstation;
 
-import org.apache.commons.lang3.tuple.Pair;
-import org.lfenergy.compas.scl2007b4.model.TLLN0Enum;
 import org.lfenergy.compas.scl2007b4.model.TSubstation;
 import org.lfenergy.compas.sct.commons.exception.ScdException;
 import org.lfenergy.compas.sct.commons.scl.SclElementAdapter;
 import org.lfenergy.compas.sct.commons.scl.SclRootAdapter;
 import org.lfenergy.compas.sct.commons.util.Utils;
 
-import java.util.List;
 import java.util.Optional;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 /**
@@ -119,18 +115,4 @@ public Stream<VoltageLevelAdapter> streamVoltageLevelAdapters() {
         return currentElem.getVoltageLevel().stream().map(tVoltageLevel -> new VoltageLevelAdapter(this, tVoltageLevel));
     }
 
-    /**
-     * Gets a pair of IedName and LDevice inst from Substation LNodes for LN0 type object
-     * @return a pair of Ied name and LDevice inst attributes
-     */
-    public List<Pair<String, String>> getIedAndLDeviceNamesForLN0FromLNode() {
-        return streamVoltageLevelAdapters()
-                .flatMap(VoltageLevelAdapter::streamBayAdapters)
-                .flatMap(BayAdapter::streamFunctionAdapters)
-                .flatMap(functionAdapter -> functionAdapter.getCurrentElem().getLNode().stream())
-                .filter(tlNode -> tlNode.getLnClass().contains(TLLN0Enum.LLN_0.value()))
-                .map(tlNode -> Pair.of(tlNode.getIedName(), tlNode.getLdInst()))
-                .collect(Collectors.toList());
-    }
-
 }
diff --git a/sct-commons/src/test/java/org/lfenergy/compas/sct/commons/LnServiceTest.java b/sct-commons/src/test/java/org/lfenergy/compas/sct/commons/LnServiceTest.java
index 2c7f4bc28..3ef1e3f72 100644
--- a/sct-commons/src/test/java/org/lfenergy/compas/sct/commons/LnServiceTest.java
+++ b/sct-commons/src/test/java/org/lfenergy/compas/sct/commons/LnServiceTest.java
@@ -13,6 +13,12 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.lfenergy.compas.scl2007b4.model.*;
 import org.lfenergy.compas.sct.commons.domain.*;
+import org.lfenergy.compas.sct.commons.dto.SclReportItem;
+import org.lfenergy.compas.sct.commons.scl.SclRootAdapter;
+import org.lfenergy.compas.sct.commons.scl.ied.DOIAdapter;
+import org.lfenergy.compas.sct.commons.scl.ied.IEDAdapter;
+import org.lfenergy.compas.sct.commons.scl.ldevice.LDeviceAdapter;
+import org.lfenergy.compas.sct.commons.scl.ln.LN0Adapter;
 import org.lfenergy.compas.sct.commons.testhelpers.SclTestMarshaller;
 import org.lfenergy.compas.sct.commons.util.ActiveStatus;
 
@@ -25,6 +31,10 @@ class LnServiceTest {
 
     private final LnService lnService = new LnService();
 
+    SubstationService substationService = new SubstationService(new VoltageLevelService());
+    LdeviceService ldeviceService = new LdeviceService(lnService);
+    DataTypeTemplatesService dataTypeTemplatesService = new DataTypeTemplatesService();
+
     @Test
     void getAnylns_should_return_lns() {
         //Given
@@ -657,4 +667,128 @@ void matchesLn_should_throw_an_exception() {
                 .hasMessageContaining("Unexpected value: ");
     }
 
+    @Test
+    void updateLDeviceStatus_shouldReturnError_whenMissingDOBeh() {
+        // Given
+        SCL scl = SclTestMarshaller.getSCLFromFile("/scd-refresh-lnode/Test_NOK_MissingBeh.scd");
+        // When
+        List<SclReportItem> sclReportItems = lnService.updateLDeviceStatus(scl, substationService, ldeviceService, dataTypeTemplatesService);
+        // Then
+        assertThat(sclReportItems)
+                .hasSize(1)
+                .extracting(SclReportItem::message, SclReportItem::xpath)
+                .containsExactly(Tuple.tuple("The LDevice doesn't have a DO @name='Beh'",
+                        "/SCL/IED[@name=IedName1]/AccessPoint/Server/LDevice[@inst=LDSUIED]/LN[class=LLN0]"));
+    }
+
+
+    @Test
+    void updateLDeviceStatus_shouldReturnError_whenMissingDOMod() {
+        // Given
+        SCL scl = SclTestMarshaller.getSCLFromFile("/scd-refresh-lnode/Test_NOK_MissingMod.scd");
+        // When
+        List<SclReportItem> sclReportItems = lnService.updateLDeviceStatus(scl, substationService, ldeviceService, dataTypeTemplatesService);
+        // Then
+        assertThat(sclReportItems.stream().noneMatch(SclReportItem::isError)).isFalse();
+        assertThat(sclReportItems)
+                .hasSize(1)
+                .extracting(SclReportItem::message, SclReportItem::xpath)
+                .containsExactly(Tuple.tuple("The LDevice doesn't have a DO @name='Mod'", "/SCL/IED[@name=IedName1]/AccessPoint/Server/LDevice[@inst=LDSUIED]/LN[class=LLN0]"));
+    }
+
+
+    @Test
+    void updateLDeviceStatus_shouldReturnError_whenEnumNotContainValues() {
+        // Given
+        SCL scl = SclTestMarshaller.getSCLFromFile("/scd-refresh-lnode/Test_NOK_MissingEnums.scd");
+        assertThat(getLDeviceStatusValue(scl).get().getValue()).isEqualTo("off");
+        // When
+        List<SclReportItem> sclReportItems = lnService.updateLDeviceStatus(scl, substationService, ldeviceService, dataTypeTemplatesService);
+        // Then
+        assertThat(sclReportItems)
+                .hasSize(1)
+                .extracting(SclReportItem::message, SclReportItem::xpath)
+                .containsExactly(Tuple.tuple("The LDevice cannot be activated or desactivated because its BehaviourKind Enum contains NOT 'on' AND NOT 'off'.",
+                        "/SCL/IED[@name=IedName1]/AccessPoint/Server/LDevice[@inst=LDSUIED]/LN[class=LLN0]"));
+        assertThat(getLDeviceStatusValue(scl).get().getValue()).isEqualTo("off");
+    }
+
+    @Test
+    void updateLDeviceStatus_shouldReturnError_whenLDeviceIsNotPresentInSubstationAndEnumNotContainOff() {
+        // Given
+        SCL scl = SclTestMarshaller.getSCLFromFile("/scd-refresh-lnode/Test_NOK_LDevice_notPresentInSubstationAndEnumNotContainOff.scd");
+        assertThat(getLDeviceStatusValue(scl).get().getValue()).isEqualTo("on");
+        // When
+        List<SclReportItem> sclReportItems = lnService.updateLDeviceStatus(scl, substationService, ldeviceService, dataTypeTemplatesService);
+        // Then
+        assertThat(sclReportItems)
+                .hasSize(1)
+                .extracting(SclReportItem::message, SclReportItem::xpath)
+                .containsExactly(Tuple.tuple("The LDevice cannot be set to 'off' but it has not been selected into SSD.",
+                        "/SCL/IED[@name=IedName1]/AccessPoint/Server/LDevice[@inst=LDSUIED]/LN[class=LLN0]"));
+        assertThat(getLDeviceStatusValue(scl).get().getValue()).isEqualTo("on");
+    }
+
+
+    @Test
+    void updateLDeviceStatus_shouldReturnError_whenLDeviceIsPresentInSubstationAndEnumNotContainOn() {
+        // Given
+        SCL scl = SclTestMarshaller.getSCLFromFile("/scd-refresh-lnode/Test_NOK_LDevice_presentInSubstationAndEnumNotContainOn.scd");
+        assertThat(getLDeviceStatusValue(scl).get().getValue()).isEqualTo("off");
+        // When
+        List<SclReportItem> sclReportItems = lnService.updateLDeviceStatus(scl, substationService, ldeviceService, dataTypeTemplatesService);
+        // Then
+        assertThat(sclReportItems)
+                .hasSize(1)
+                .extracting(SclReportItem::message, SclReportItem::xpath)
+                .containsExactly(Tuple.tuple("The LDevice cannot be set to 'on' but has been selected into SSD.",
+                        "/SCL/IED[@name=IedName1]/AccessPoint/Server/LDevice[@inst=LDSUIED]/LN[class=LLN0]"));
+        assertThat(getLDeviceStatusValue(scl).get().getValue()).isEqualTo("off");
+    }
+
+    @Test
+    void updateLDeviceStatus_shouldDeactivate_whenLDeviceIsNotPresentInSubstation_AndEnumContainOff() {
+        // Given
+        SCL scl = SclTestMarshaller.getSCLFromFile("/scd-refresh-lnode/Test_OK_LDevice_notPresentInSubstation.scd");
+        assertThat(getLDeviceStatusValue(scl).get().getValue()).isEqualTo("on");
+        // When
+        List<SclReportItem> sclReportItems = lnService.updateLDeviceStatus(scl, substationService, ldeviceService, dataTypeTemplatesService);
+        // Then
+        assertThat(sclReportItems).isEmpty();
+        assertThat(getLDeviceStatusValue(scl).get().getValue()).isEqualTo("off");
+    }
+
+    @Test
+    void updateLDeviceStatus_shouldActivate_whenLDeviceIsPresentInSubstation_AndEnumContainOn() {
+        // Given
+        SCL scl = SclTestMarshaller.getSCLFromFile("/scd-refresh-lnode/Test_OK_LDevice_presentInSubstation.scd");
+        assertThat(getLDeviceStatusValue(scl).get().getValue()).isEqualTo("off");
+        // When
+        List<SclReportItem> sclReportItems = lnService.updateLDeviceStatus(scl, substationService, ldeviceService, dataTypeTemplatesService);
+        // Then
+        assertThat(sclReportItems).isEmpty();
+        assertThat(getLDeviceStatusValue(scl).get().getValue()).isEqualTo("on");
+    }
+
+    private Optional<TVal> getLDeviceStatusValue(SCL scl) {
+        return getValFromDaiName(scl);
+    }
+
+    private Optional<TVal> getValFromDaiName(SCL scl) {
+        SclRootAdapter sclRootAdapter = new SclRootAdapter(scl);
+        IEDAdapter iedAdapter = sclRootAdapter.getIEDAdapterByName("IedName1");
+        Optional<LDeviceAdapter> lDeviceAdapter = iedAdapter.findLDeviceAdapterByLdInst("LDSUIED");
+        LN0Adapter ln0Adapter = lDeviceAdapter.get().getLN0Adapter();
+        Optional<DOIAdapter> doiAdapter = ln0Adapter.getDOIAdapters().stream()
+                .filter(doiAdapter1 -> doiAdapter1.getCurrentElem().getName().equals("Mod"))
+                .findFirst();
+        return doiAdapter.flatMap(adapter -> adapter.getCurrentElem().getSDIOrDAI().stream()
+                .filter(tUnNaming -> tUnNaming.getClass().equals(TDAI.class))
+                .map(TDAI.class::cast)
+                .filter(tdai -> tdai.getName().equals("stVal") && !tdai.getVal().isEmpty())
+                .map(tdai -> tdai.getVal().get(0))
+                .findFirst());
+    }
+
+
 }
diff --git a/sct-commons/src/test/java/org/lfenergy/compas/sct/commons/SclServiceTest.java b/sct-commons/src/test/java/org/lfenergy/compas/sct/commons/SclServiceTest.java
index dafaf271a..4b775bd8f 100644
--- a/sct-commons/src/test/java/org/lfenergy/compas/sct/commons/SclServiceTest.java
+++ b/sct-commons/src/test/java/org/lfenergy/compas/sct/commons/SclServiceTest.java
@@ -9,9 +9,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.CsvSource;
-import org.junit.jupiter.params.provider.MethodSource;
 import org.lfenergy.compas.scl2007b4.model.*;
 import org.lfenergy.compas.sct.commons.dto.*;
 import org.lfenergy.compas.sct.commons.exception.ScdException;
@@ -21,7 +19,6 @@
 import org.lfenergy.compas.sct.commons.scl.ldevice.LDeviceAdapter;
 import org.lfenergy.compas.sct.commons.scl.ln.LN0Adapter;
 import org.lfenergy.compas.sct.commons.scl.ln.LNAdapter;
-import org.lfenergy.compas.sct.commons.testhelpers.MarshallerWrapper;
 import org.lfenergy.compas.sct.commons.testhelpers.SclTestMarshaller;
 import org.mockito.InjectMocks;
 import org.mockito.junit.jupiter.MockitoExtension;
@@ -29,7 +26,6 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
-import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -46,60 +42,6 @@ class SclServiceTest {
     @InjectMocks
     SclService sclService;
 
-    private static Stream<Arguments> sclProviderMissingRequiredObjects() {
-        SCL scl1 = SclTestMarshaller.getSCLFromFile("/scd-refresh-lnode/issue68_Test_KO_MissingBeh.scd");
-        SCL scl2 = SclTestMarshaller.getSCLFromFile("/scd-refresh-lnode/issue68_Test_KO_MissingLDevicePrivate.scd");
-        SCL scl3 = SclTestMarshaller.getSCLFromFile("/scd-refresh-lnode/issue68_Test_KO_MissingLDevicePrivateAttribute.scd");
-        SCL scl4 = SclTestMarshaller.getSCLFromFile("/scd-refresh-lnode/issue68_Test_KO_MissingMod.scd");
-        Tuple[] scl1Errors = new Tuple[]{Tuple.tuple("The LDevice doesn't have a DO @name='Beh' OR its associated DA@fc='ST' AND DA@name='stVal'",
-                "/SCL/IED[@name=\"IedName1\"]/AccessPoint/Server/LDevice[@inst=\"LDSUIED\"]/LN0")};
-        Tuple[] scl2Errors = new Tuple[]{Tuple.tuple("The LDevice doesn't have a Private compas:LDevice.",
-                "/SCL/IED[@name=\"IedName1\"]/AccessPoint/Server/LDevice[@inst=\"LDSUIED\"]/LN0")};
-        Tuple[] scl3Errors = new Tuple[]{Tuple.tuple("The Private compas:LDevice doesn't have the attribute 'LDeviceStatus'",
-                "/SCL/IED[@name=\"IedName1\"]/AccessPoint/Server/LDevice[@inst=\"LDSUIED\"]/LN0")};
-        Tuple[] scl4Errors = new Tuple[]{Tuple.tuple("The LDevice doesn't have a DO @name='Mod'",
-                "/SCL/IED[@name=\"IedName1\"]/AccessPoint/Server/LDevice[@inst=\"LDSUIED\"]/LN0")};
-        return Stream.of(
-                Arguments.of("MissingDOBeh", scl1, scl1Errors),
-                Arguments.of("MissingLDevicePrivate", scl2, scl2Errors),
-                Arguments.of("MissingLDevicePrivateAttribute", scl3, scl3Errors),
-                Arguments.of("MissingDOMod", scl4, scl4Errors)
-        );
-    }
-
-    private static Stream<Arguments> sclProviderBasedLDeviceStatus() {
-        SCL scl1 = SclTestMarshaller.getSCLFromFile("/scd-refresh-lnode/issue68_Test_LD_STATUS_ACTIVE.scd");
-        SCL scl2 = SclTestMarshaller.getSCLFromFile("/scd-refresh-lnode/issue68_Test_LD_STATUS_UNTESTED.scd");
-        SCL scl3 = SclTestMarshaller.getSCLFromFile("/scd-refresh-lnode/issue68_Test1_LD_STATUS_INACTIVE.scd");
-        Tuple[] scl1Errors = new Tuple[]{Tuple.tuple("The LDevice cannot be set to 'off' but has not been selected into SSD.",
-                "/SCL/IED[@name=\"IedName1\"]/AccessPoint/Server/LDevice[@inst=\"LDSUIED\"]/LN0"),
-                Tuple.tuple("The LDevice cannot be set to 'on' but has been selected into SSD.",
-                        "/SCL/IED[@name=\"IedName2\"]/AccessPoint/Server/LDevice[@inst=\"LDSUIED\"]/LN0"),
-                Tuple.tuple("The LDevice cannot be activated or desactivated because its BehaviourKind Enum contains NOT 'on' AND NOT 'off'.",
-                        "/SCL/IED[@name=\"IedName3\"]/AccessPoint/Server/LDevice[@inst=\"LDSUIED\"]/LN0"
-                )};
-        Tuple[] scl2Errors = new Tuple[]{Tuple.tuple("The LDevice cannot be set to 'off' but has not been selected into SSD.",
-                "/SCL/IED[@name=\"IedName1\"]/AccessPoint/Server/LDevice[@inst=\"LDSUIED\"]/LN0"),
-                Tuple.tuple("The LDevice cannot be set to 'on' but has been selected into SSD.",
-                        "/SCL/IED[@name=\"IedName2\"]/AccessPoint/Server/LDevice[@inst=\"LDSUIED\"]/LN0"),
-                Tuple.tuple("The LDevice cannot be activated or desactivated because its BehaviourKind Enum contains NOT 'on' AND NOT 'off'.",
-                        "/SCL/IED[@name=\"IedName3\"]/AccessPoint/Server/LDevice[@inst=\"LDSUIED\"]/LN0"
-                )};
-        Tuple[] scl3Errors = new Tuple[]{Tuple.tuple("The LDevice is not qualified into STD but has been selected into SSD.",
-                "/SCL/IED[@name=\"IedName1\"]/AccessPoint/Server/LDevice[@inst=\"LDSUIED\"]/LN0"),
-                Tuple.tuple("The LDevice cannot be set to 'on' but has been selected into SSD.",
-                        "/SCL/IED[@name=\"IedName2\"]/AccessPoint/Server/LDevice[@inst=\"LDSUIED\"]/LN0"),
-                Tuple.tuple("The LDevice cannot be activated or desactivated because its BehaviourKind Enum contains NOT 'on' AND NOT 'off'.",
-                        "/SCL/IED[@name=\"IedName3\"]/AccessPoint/Server/LDevice[@inst=\"LDSUIED\"]/LN0"
-                )};
-        return Stream.of(
-                Arguments.of("ACTIVE", scl1, scl1Errors),
-                Arguments.of("UNTESTED", scl2, scl2Errors),
-                Arguments.of("INACTIVE", scl3, scl3Errors)
-        );
-    }
-
-
     @Test
     void addHistoryItem_should_add_history_elements() throws ScdException {
         //Given
@@ -396,134 +338,6 @@ void importSTDElementsInSCD_whenNoSTDMatch_shouldThrowException() {
                 .hasMessage("There is no STD file found corresponding to headerId = f8dbc8c1-2db7-4652-a9d6-0b414bdeccfa, headerVersion = 01.00.00, headerRevision = 01.00.00 and ICDSystemVersionUUID = IED4d4fe1a8cda64cf88a5ee4176a1a0eef");
     }
 
-    @ParameterizedTest(name = "{0}")
-    @MethodSource("sclProviderMissingRequiredObjects")
-    void updateLDeviceStatus_whenMissingRequiredObject_shouldReturnReportWithError(String testCase, SCL scl, Tuple... errors) {
-        // Given
-        assertThat(getLDeviceStatusValue(scl, "IedName1", "LDSUIED")).isPresent();
-        assertThat(getLDeviceStatusValue(scl, "IedName1", "LDSUIED").get().getValue()).isEqualTo("off");
-        String before = MarshallerWrapper.marshall(scl);
-        // When
-        List<SclReportItem> sclReportItems = sclService.updateLDeviceStatus(scl);
-        // Then
-        String after = MarshallerWrapper.marshall(scl);
-        assertThat(sclReportItems.stream().noneMatch(SclReportItem::isError)).isFalse();
-        assertThat(sclReportItems)
-                .hasSize(1)
-                .extracting(SclReportItem::message, SclReportItem::xpath)
-                .containsExactly(errors);
-        assertThat(getLDeviceStatusValue(scl, "IedName1", "LDSUIED").get().getValue()).isEqualTo("off");
-        assertThat(before).isEqualTo(after);
-    }
-
-    @ParameterizedTest(name = "{0}")
-    @MethodSource("sclProviderBasedLDeviceStatus")
-    void updateLDeviceStatus_whenLDeviceStatusActiveOrUntestedOrInactive_shouldReturnReportWithError(String testCase, SCL scl, Tuple... errors) {
-        // Given
-        assertThat(getLDeviceStatusValue(scl, "IedName1", "LDSUIED").get().getValue()).isEqualTo("off");
-        assertThat(getLDeviceStatusValue(scl, "IedName2", "LDSUIED").get().getValue()).isEqualTo("on");
-        assertThat(getLDeviceStatusValue(scl, "IedName3", "LDSUIED")).isEmpty();
-        String before = MarshallerWrapper.marshall(scl);
-        // When
-        List<SclReportItem> sclReportItems = sclService.updateLDeviceStatus(scl);
-        // Then
-        String after = MarshallerWrapper.marshall(scl);
-        assertThat(sclReportItems.stream().noneMatch(SclReportItem::isError)).isFalse();
-        assertThat(sclReportItems)
-                .hasSize(3)
-                .extracting(SclReportItem::message, SclReportItem::xpath)
-                .containsExactly(errors);
-        assertThat(getLDeviceStatusValue(scl, "IedName1", "LDSUIED").get().getValue()).isEqualTo("off");
-        assertThat(getLDeviceStatusValue(scl, "IedName2", "LDSUIED").get().getValue()).isEqualTo("on");
-        assertThat(getLDeviceStatusValue(scl, "IedName3", "LDSUIED")).isEmpty();
-        assertThat(before).isEqualTo(after);
-    }
-
-    @Test
-    void updateLDeviceStatus_whenAllLDeviceInactive_shouldReturnReportWithError() {
-        // Given
-        SCL scl = SclTestMarshaller.getSCLFromFile("/scd-refresh-lnode/issue68_Test2_LD_STATUS_INACTIVE.scd");
-        assertThat(getLDeviceStatusValue(scl, "IedName1", "LDSUIED").get().getValue()).isEqualTo("off");
-        assertThat(getLDeviceStatusValue(scl, "IedName2", "LDSUIED").get().getValue()).isEqualTo("on");
-        assertThat(getLDeviceStatusValue(scl, "IedName3", "LDSUIED")).isEmpty();
-        // When
-        List<SclReportItem> sclReportItems = sclService.updateLDeviceStatus(scl);
-        // Then
-        assertThat(sclReportItems.stream().noneMatch(SclReportItem::isError)).isFalse();
-        assertThat(sclReportItems)
-                .hasSize(2)
-                .extracting(SclReportItem::message, SclReportItem::xpath)
-                .containsExactly(Tuple.tuple("The LDevice cannot be set to 'off' but has not been selected into SSD.",
-                                "/SCL/IED[@name=\"IedName1\"]/AccessPoint/Server/LDevice[@inst=\"LDSUIED\"]/LN0"),
-                        Tuple.tuple("The LDevice is not qualified into STD but has been selected into SSD.",
-                                "/SCL/IED[@name=\"IedName2\"]/AccessPoint/Server/LDevice[@inst=\"LDSUIED\"]/LN0"));
-        assertThat(getLDeviceStatusValue(scl, "IedName1", "LDSUIED").get().getValue()).isEqualTo("off");
-        assertThat(getLDeviceStatusValue(scl, "IedName2", "LDSUIED").get().getValue()).isEqualTo("on");
-        assertThat(getLDeviceStatusValue(scl, "IedName3", "LDSUIED")).isPresent();
-        assertThat(getLDeviceStatusValue(scl, "IedName3", "LDSUIED").get().getValue()).isEqualTo("off");
-    }
-
-    @Test
-    void updateLDeviceStatus_shouldReturnUpdatedFile() {
-        // Given
-        SCL givenScl = SclTestMarshaller.getSCLFromFile("/scd-refresh-lnode/issue68_Test_Template.scd");
-        assertThat(getLDeviceStatusValue(givenScl, "IedName1", "LDSUIED")).isPresent();
-        assertThat(getLDeviceStatusValue(givenScl, "IedName1", "LDSUIED").get().getValue()).isEqualTo("off");
-        assertThat(getLDeviceStatusValue(givenScl, "IedName2", "LDSUIED")).isPresent();
-        assertThat(getLDeviceStatusValue(givenScl, "IedName2", "LDSUIED").get().getValue()).isEqualTo("on");
-        assertThat(getLDeviceStatusValue(givenScl, "IedName3", "LDSUIED")).isEmpty();
-        // When
-        List<SclReportItem> sclReportItems = sclService.updateLDeviceStatus(givenScl);
-        // Then
-        assertThat(sclReportItems.stream().noneMatch(SclReportItem::isError)).isTrue();
-        assertThat(getLDeviceStatusValue(givenScl, "IedName1", "LDSUIED")).isPresent();
-        assertThat(getLDeviceStatusValue(givenScl, "IedName1", "LDSUIED").get().getValue()).isEqualTo("on");
-        assertThat(getLDeviceStatusValue(givenScl, "IedName2", "LDSUIED")).isPresent();
-        assertThat(getLDeviceStatusValue(givenScl, "IedName2", "LDSUIED").get().getValue()).isEqualTo("off");
-        assertThat(getLDeviceStatusValue(givenScl, "IedName3", "LDSUIED")).isPresent();
-        assertThat(getLDeviceStatusValue(givenScl, "IedName3", "LDSUIED").get().getValue()).isEqualTo("off");
-    }
-
-    @Test
-    void updateLDeviceStatus_when_DAI_Mod_DO_stVal_whateverIsUpdatableOrNot_shouldReturnUpdatedFile() {
-        // Given
-        SCL givenScl = SclTestMarshaller.getSCLFromFile("/scd-refresh-lnode/issue_165_enhance_68_Test_Dai_Updatable.scd");
-        assertThat(getLDeviceStatusValue(givenScl, "IedName1", "LDSUIED"))
-                .map(TVal::getValue)
-                .hasValue("off");
-        assertThat(getLDeviceStatusValue(givenScl, "IedName2", "LDSUIED"))
-                .map(TVal::getValue)
-                .hasValue("on");
-        assertThat(getLDeviceStatusValue(givenScl, "IedName3", "LDSUIED"))
-                .map(TVal::getValue)
-                .isNotPresent();
-        assertThat(getLDeviceStatusValue(givenScl, "IedName4", "LDSUIED"))
-                .map(TVal::getValue)
-                .hasValue("on");
-        assertThat(getLDeviceStatusValue(givenScl, "IedName5", "LDSUIED"))
-                .map(TVal::getValue)
-                .hasValue("on");
-        // When
-        List<SclReportItem> sclReportItems = sclService.updateLDeviceStatus(givenScl);
-        // Then
-        assertThat(sclReportItems.stream().noneMatch(SclReportItem::isError)).isTrue();
-        assertThat(getLDeviceStatusValue(givenScl, "IedName1", "LDSUIED"))
-                .map(TVal::getValue)
-                .hasValue("on");
-        assertThat(getLDeviceStatusValue(givenScl, "IedName2", "LDSUIED"))
-                .map(TVal::getValue)
-                .hasValue("off");
-        assertThat(getLDeviceStatusValue(givenScl, "IedName3", "LDSUIED"))
-                .map(TVal::getValue)
-                .hasValue("off");
-        assertThat(getLDeviceStatusValue(givenScl, "IedName4", "LDSUIED"))
-                .map(TVal::getValue)
-                .hasValue("off");
-        assertThat(getLDeviceStatusValue(givenScl, "IedName5", "LDSUIED"))
-                .map(TVal::getValue)
-                .hasValue("off");
-    }
-
     private Optional<TVal> getLDeviceStatusValue(SCL scl, String iedName, String ldInst) {
         return getValFromDaiName(scl, iedName, ldInst, "Mod", "stVal");
     }
diff --git a/sct-commons/src/test/java/org/lfenergy/compas/sct/commons/scl/ldevice/LDeviceActivationTest.java b/sct-commons/src/test/java/org/lfenergy/compas/sct/commons/scl/ldevice/LDeviceActivationTest.java
deleted file mode 100644
index 8858ed3ac..000000000
--- a/sct-commons/src/test/java/org/lfenergy/compas/sct/commons/scl/ldevice/LDeviceActivationTest.java
+++ /dev/null
@@ -1,199 +0,0 @@
-// SPDX-FileCopyrightText: 2022 RTE FRANCE
-//
-// SPDX-License-Identifier: Apache-2.0
-
-package org.lfenergy.compas.sct.commons.scl.ldevice;
-
-import org.apache.commons.lang3.tuple.Pair;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.CsvSource;
-import org.junit.jupiter.params.provider.ValueSource;
-import org.lfenergy.compas.scl2007b4.model.TCompasLDeviceStatus;
-
-import java.util.List;
-import java.util.Set;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-class LDeviceActivationTest {
-
-    @ParameterizedTest
-    @ValueSource(strings = {"ACTIVE", "UNTESTED"})
-    void checkLDeviceActivationStatus_shouldReturnNoError_when_LDeviceStatusACTIVE_Or_UNTESTED_And_Contains_ON_And_LDeviceReferencedINLNode(String lDeviceStatus) {
-        // Given
-        List<Pair<String, String>> iedNameLdInstList = List.of(Pair.of("iedName1", "ldInst1"));
-        LDeviceActivation lDeviceActivation = new LDeviceActivation(iedNameLdInstList);
-        lDeviceActivation.setNewVal("on");
-        // When
-        lDeviceActivation.checkLDeviceActivationStatus("iedName1", "ldInst1", TCompasLDeviceStatus.fromValue(lDeviceStatus), Set.of("on"));
-        // Then
-        assertThat(lDeviceActivation.isUpdatable()).isTrue();
-        assertThat(lDeviceActivation.getErrorMessage()).isNull();
-        assertThat(lDeviceActivation.getNewVal()).isEqualTo("on");
-    }
-
-    @ParameterizedTest
-    @ValueSource(strings = {"ACTIVE", "UNTESTED"})
-    void checkLDeviceActivationStatus_shouldReturnError_when_LDeviceStatusACTIVE_Or_UNTESTED_And_Contains_ON_And_NotLDeviceReferencedINLNode(String lDeviceStatus) {
-        // Given
-        List<Pair<String, String>> iedNameLdInstList = List.of();
-        LDeviceActivation lDeviceActivation = new LDeviceActivation(iedNameLdInstList);
-        lDeviceActivation.setNewVal("on");
-        // When
-        lDeviceActivation.checkLDeviceActivationStatus("iedName1", "ldInst2", TCompasLDeviceStatus.valueOf(lDeviceStatus), Set.of("on"));
-        // Then
-        assertThat(lDeviceActivation.isUpdatable()).isFalse();
-        assertThat(lDeviceActivation.getErrorMessage()).isEqualTo("The LDevice cannot be set to 'off' but has not been selected into SSD.");
-        assertThat(lDeviceActivation.getNewVal()).isEqualTo("on");
-    }
-
-    @ParameterizedTest
-    @ValueSource(strings = {"ACTIVE", "UNTESTED"})
-    void checkLDeviceActivationStatus_shouldReturnError_when_LDeviceStatusACTIVE_Or_UNTESTED_And_Contains_OFF_And_LDeviceReferencedINLNode(String lDeviceStatus) {
-        // Given
-        List<Pair<String, String>> iedNameLdInstList = List.of(Pair.of("iedName1", "ldInst1"));
-        LDeviceActivation lDeviceActivation = new LDeviceActivation(iedNameLdInstList);
-        lDeviceActivation.setNewVal("off");
-        // When
-        lDeviceActivation.checkLDeviceActivationStatus("iedName1", "ldInst1", TCompasLDeviceStatus.valueOf(lDeviceStatus), Set.of("off"));
-        // Then
-        assertThat(lDeviceActivation.isUpdatable()).isFalse();
-        assertThat(lDeviceActivation.getErrorMessage()).isEqualTo(
-                "The LDevice cannot be set to 'on' but has been selected into SSD.");
-        assertThat(lDeviceActivation.getNewVal()).isEqualTo("off");
-    }
-
-    @ParameterizedTest
-    @ValueSource(strings = {"ACTIVE", "UNTESTED"})
-    void checkLDeviceActivationStatus_shouldReturnNoError_when_LDeviceStatusACTIVE_Or_UNTESTED_And_Contains_OFF_And_NotLDeviceReferencedINLNode(String lDeviceStatus) {
-        // Given
-        List<Pair<String, String>> iedNameLdInstList = List.of();
-        LDeviceActivation lDeviceActivation = new LDeviceActivation(iedNameLdInstList);
-        lDeviceActivation.setNewVal("on");
-        // When
-        lDeviceActivation.checkLDeviceActivationStatus("iedName1", "ldInst1", TCompasLDeviceStatus.valueOf(lDeviceStatus), Set.of("off"));
-        // Then
-        assertThat(lDeviceActivation.isUpdatable()).isTrue();
-        assertThat(lDeviceActivation.getErrorMessage()).isNull();
-        assertThat(lDeviceActivation.getNewVal()).isEqualTo("off");
-    }
-
-    @ParameterizedTest
-    @ValueSource(strings = {"ACTIVE", "UNTESTED"})
-    void checkLDeviceActivationStatus_shouldReturnNoError_when_LDeviceStatusACTIVE_Or_UNTESTED_And_Contains_ON_And_OFF_And_LDeviceReferencedINLNode(String lDeviceStatus) {
-        // Given
-        List<Pair<String, String>> iedNameLdInstList = List.of(Pair.of("iedName1", "ldInst1"));
-        LDeviceActivation lDeviceActivation = new LDeviceActivation(iedNameLdInstList);
-        lDeviceActivation.setNewVal("off");
-        // When
-        lDeviceActivation.checkLDeviceActivationStatus("iedName1", "ldInst1", TCompasLDeviceStatus.valueOf(lDeviceStatus), Set.of("on", "off"));
-        // Then
-        assertThat(lDeviceActivation.isUpdatable()).isTrue();
-        assertThat(lDeviceActivation.getErrorMessage()).isNull();
-        assertThat(lDeviceActivation.getNewVal()).isEqualTo("on");
-    }
-
-    @ParameterizedTest
-    @ValueSource(strings = {"ACTIVE", "UNTESTED"})
-    void checkLDeviceActivationStatus_shouldReturnNoError_when_LDeviceStatusACTIVE_Or_UNTESTED_And_Contains_ON_And_OFF_And_NotLDeviceReferencedINLNode(String lDeviceStatus) {
-        // Given
-        List<Pair<String, String>> iedNameLdInstList = List.of();
-        LDeviceActivation lDeviceActivation = new LDeviceActivation(iedNameLdInstList);
-        lDeviceActivation.setNewVal("off");
-        // When
-        lDeviceActivation.checkLDeviceActivationStatus("iedName1", "ldInst2", TCompasLDeviceStatus.valueOf(lDeviceStatus), Set.of("on", "off"));
-        // Then
-        assertThat(lDeviceActivation.isUpdatable()).isTrue();
-        assertThat(lDeviceActivation.getErrorMessage()).isNull();
-        assertThat(lDeviceActivation.getNewVal()).isEqualTo("off");
-    }
-
-    @ParameterizedTest
-    @CsvSource(value = {"ACTIVE; iedName1; ldInst1","INACTIVE; iedName1; ldInst1", "UNTESTED; iedName1; ldInst1", "ACTIVE;;","INACTIVE;;", "UNTESTED;;"}, delimiter = ';')
-    void checkLDeviceActivationStatus_shouldReturnError_when_Contains_Not_ON_Nor_OFF(String lDeviceStatus, String iedName, String ldInst) {
-        // Given
-        List<Pair<String, String>> iedNameLdInstList = List.of(Pair.of(iedName, ldInst));
-        LDeviceActivation lDeviceActivation = new LDeviceActivation(iedNameLdInstList);
-        lDeviceActivation.setNewVal("off");
-        // When
-        lDeviceActivation.checkLDeviceActivationStatus("iedName1", "ldInst1", TCompasLDeviceStatus.valueOf(lDeviceStatus), Set.of());
-        // Then
-        assertThat(lDeviceActivation.isUpdatable()).isFalse();
-        assertThat(lDeviceActivation.getErrorMessage()).isEqualTo(
-                "The LDevice cannot be activated or desactivated because its BehaviourKind Enum contains NOT 'on' AND NOT 'off'.");
-        assertThat(lDeviceActivation.getNewVal()).isEqualTo("off");
-    }
-
-    @Test
-    void checkLDeviceActivationStatus_shouldReturnError_when_LDeviceStatusINACTIVE_And_Contains_ON_And_LDeviceReferencedINLNode() {
-        // Given
-        List<Pair<String, String>> iedNameLdInstList = List.of(Pair.of("iedName1", "ldInst1"));
-        LDeviceActivation lDeviceActivation = new LDeviceActivation(iedNameLdInstList);
-        lDeviceActivation.setNewVal("on");
-        // When
-        lDeviceActivation.checkLDeviceActivationStatus("iedName1", "ldInst1", TCompasLDeviceStatus.INACTIVE, Set.of("on"));
-        // Then
-        assertThat(lDeviceActivation.isUpdatable()).isFalse();
-        assertThat(lDeviceActivation.getErrorMessage()).isEqualTo("The LDevice is not qualified into STD but has been selected into SSD.");
-        assertThat(lDeviceActivation.getNewVal()).isEqualTo("on");
-    }
-
-    @Test
-    void checkLDeviceActivationStatus_shouldReturnNoError_when_LDeviceStatusINACTIVE_And_Contains_ON_And_OFF_And_NotLDeviceReferencedINLNode() {
-        // Given
-        List<Pair<String, String>> iedNameLdInstList = List.of();
-        LDeviceActivation lDeviceActivation = new LDeviceActivation(iedNameLdInstList);
-        lDeviceActivation.setNewVal("on");
-        // When
-        lDeviceActivation.checkLDeviceActivationStatus("iedName1", "ldInst1", TCompasLDeviceStatus.INACTIVE, Set.of("on", "off"));
-        // Then
-        assertThat(lDeviceActivation.isUpdatable()).isTrue();
-        assertThat(lDeviceActivation.getErrorMessage()).isNull();
-        assertThat(lDeviceActivation.getNewVal()).isEqualTo("off");
-    }
-
-    @Test
-    void checkLDeviceActivationStatus_shouldReturnError_when_LDeviceStatusINACTIVE_And_Contains_ON_And_NotLDeviceReferencedINLNode() {
-        // Given
-        List<Pair<String, String>> iedNameLdInstList = List.of();
-        LDeviceActivation lDeviceActivation = new LDeviceActivation(iedNameLdInstList);
-        lDeviceActivation.setNewVal("on");
-        // When
-        lDeviceActivation.checkLDeviceActivationStatus("iedName1", "ldInst1", TCompasLDeviceStatus.INACTIVE, Set.of("on"));
-        // Then
-        assertThat(lDeviceActivation.isUpdatable()).isFalse();
-        assertThat(lDeviceActivation.getErrorMessage()).isEqualTo("The LDevice cannot be set to 'off' but has not been selected into SSD.");
-        assertThat(lDeviceActivation.getNewVal()).isEqualTo("on");
-    }
-
-    @Test
-    void checkLDeviceActivationStatus_shouldReturnNoError_when_LDeviceStatusINACTIVE_And_Contains_OFF_And_NotLDeviceReferencedINLNode() {
-        // Given
-        List<Pair<String, String>> iedNameLdInstList = List.of();
-        LDeviceActivation lDeviceActivation = new LDeviceActivation(iedNameLdInstList);
-        lDeviceActivation.setNewVal("on");
-        // When
-        lDeviceActivation.checkLDeviceActivationStatus("iedName1", "ldInst1", TCompasLDeviceStatus.INACTIVE, Set.of("off"));
-        // Then
-        assertThat(lDeviceActivation.isUpdatable()).isTrue();
-        assertThat(lDeviceActivation.getErrorMessage()).isNull();
-        assertThat(lDeviceActivation.getNewVal()).isEqualTo("off");
-    }
-
-    @Test
-    void checkLDeviceActivationStatus_shouldReturnError_when_LDeviceStatusINACTIVE_And_Contains_ON_And_OFF_And_LDeviceReferencedINLNode() {
-        // Given
-        List<Pair<String, String>> iedNameLdInstList = List.of(Pair.of("iedName1", "ldInst1"));
-        LDeviceActivation lDeviceActivation = new LDeviceActivation(iedNameLdInstList);
-        lDeviceActivation.setNewVal("off");
-        // When
-        lDeviceActivation.checkLDeviceActivationStatus("iedName1", "ldInst1", TCompasLDeviceStatus.INACTIVE, Set.of("on", "off"));
-        // Then
-        assertThat(lDeviceActivation.isUpdatable()).isFalse();
-        assertThat(lDeviceActivation.getErrorMessage()).isEqualTo(
-                "The LDevice is not qualified into STD but has been selected into SSD.");
-        assertThat(lDeviceActivation.getNewVal()).isEqualTo("off");
-    }
-
-}
\ No newline at end of file
diff --git a/sct-commons/src/test/java/org/lfenergy/compas/sct/commons/scl/sstation/SubstationAdapterTest.java b/sct-commons/src/test/java/org/lfenergy/compas/sct/commons/scl/sstation/SubstationAdapterTest.java
index f7d1abdc2..1f7edd2f9 100644
--- a/sct-commons/src/test/java/org/lfenergy/compas/sct/commons/scl/sstation/SubstationAdapterTest.java
+++ b/sct-commons/src/test/java/org/lfenergy/compas/sct/commons/scl/sstation/SubstationAdapterTest.java
@@ -4,7 +4,6 @@
 
 package org.lfenergy.compas.sct.commons.scl.sstation;
 
-import org.apache.commons.lang3.tuple.Pair;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.lfenergy.compas.scl2007b4.model.SCL;
@@ -12,9 +11,6 @@
 import org.lfenergy.compas.scl2007b4.model.TSubstation;
 import org.lfenergy.compas.scl2007b4.model.TVoltageLevel;
 import org.lfenergy.compas.sct.commons.scl.SclRootAdapter;
-import org.lfenergy.compas.sct.commons.testhelpers.SclTestMarshaller;
-
-import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -93,19 +89,4 @@ void addPrivate_with_type_and_source_should_create_Private() {
         assertThat(substationAdapter.getCurrentElem().getPrivate()).isNotEmpty();
     }
 
-
-    @Test
-    void getIedAndLDeviceNamesForLN0FromLNode_whenLNodeContainsLN0_shouldReturnListOf1Pair() {
-        // Given
-        SCL scl = SclTestMarshaller.getSCLFromFile("/scd-refresh-lnode/issue68_Test_Template.scd");
-        SclRootAdapter sclRootAdapter = new SclRootAdapter(scl);
-        substationAdapter = sclRootAdapter.getSubstationAdapter();
-        // When
-        List<Pair<String, String>> iedNameLdInstList = substationAdapter.getIedAndLDeviceNamesForLN0FromLNode();
-        // Then
-        assertThat(iedNameLdInstList)
-                .hasSize(1)
-                .containsExactly(Pair.of("IedName1", "LDSUIED"));
-    }
-
 }
diff --git a/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_KO_MissingLDevicePrivateAttribute.scd b/sct-commons/src/test/resources/scd-refresh-lnode/Test_NOK_LDevice_notPresentInSubstationAndEnumNotContainOff.scd
similarity index 74%
rename from sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_KO_MissingLDevicePrivateAttribute.scd
rename to sct-commons/src/test/resources/scd-refresh-lnode/Test_NOK_LDevice_notPresentInSubstationAndEnumNotContainOff.scd
index b592f569d..da17628ab 100644
--- a/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_KO_MissingLDevicePrivateAttribute.scd
+++ b/sct-commons/src/test/resources/scd-refresh-lnode/Test_NOK_LDevice_notPresentInSubstationAndEnumNotContainOff.scd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- SPDX-FileCopyrightText: 2022 RTE FRANCE -->
+<!-- SPDX-FileCopyrightText: 2022 2023 2024 2025 TE FRANCE -->
 <!-- -->
 <!-- SPDX-License-Identifier: Apache-2.0 -->
 <SCL xmlns:compas="https://www.lfenergy.org/compas/extension/v1" xmlns="http://www.iec.ch/61850/2003/SCL" version="2007" revision="B" release="4">
@@ -12,9 +12,6 @@
 		</History>
 	</Header>
 	<Substation name="SITE">
-		<Private type="RTE-ExportSite">
-			<rte:ExportSite xmlns:rte="http://www.rte-france.com" Indice="2" Label="PALLU" UUID="d66637d5-2387-409e-99c3-f3d67079013a" />
-		</Private>
 		<VoltageLevel nomFreq="50" numPhases="3" name="0">
 			<Voltage unit="V" multiplier="k">0</Voltage>
 			<Bay name="BAY_1">
@@ -29,16 +26,6 @@
 					<Private type="COMPAS-Function">
 						<compas:Function UUID="8f4cda3f-828c-4006-9b87-2af96b19304b" Label="FUNCTION_1" />
 					</Private>
-					<LNode iedName="IedName1" ldInst="LDSUIED" lnClass="LLN0" lnInst="">
-						<Private type="COMPAS-ICDHeader">
-                            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed"
-                                              IEDSystemVersioninstance="1" IEDType="SAMU" IEDSubstationinstance="3"
-                                              IEDName="IedName1" VendorName="RTE" IEDmodel="ICDfromModeling"
-                                              IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00"
-                                              headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
-                                              headerRevision="01.00.00"/>
-						</Private>
-					</LNode>
 				</Function>
 			</Bay>
 		</VoltageLevel>
@@ -76,9 +63,6 @@
 			<Server>
 				<Authentication />
 				<LDevice inst="LDSUIED" ldName="IedName1LDSUIED" desc="IED Monitoring Function">
-					<Private type="COMPAS-LDevice">
-						<compas:LDevice xmlns:compas="https://www.lfenergy.org/compas/extension/v1" LDeviceID="IedName1LDSUIED"/>
-					</Private>
 					<LN0 lnClass="LLN0" inst="" lnType="LNType1" desc="Logical node zero">
 						<DOI name="NamPlt">
 							<DAI name="swRev">
@@ -90,7 +74,7 @@
 						</DOI>
 						<DOI name="Mod">
 							<DAI name="stVal" valImport="true">
-								<Val>off</Val>
+								<Val>on</Val>
 							</DAI>
 						</DOI>
 					</LN0>
@@ -99,12 +83,11 @@
 		</AccessPoint>
 		<AccessPoint name="ADMIN_AP" />
 	</IED>
-
 	<DataTypeTemplates>
 		<LNodeType lnClass="LLN0" id="LNType1">
 			<DO name="NamPlt" type="DO1" transient="false" />
 			<DO name="Mod" type="DO2" transient="false" />
-			<DO name="Beh" type="DO2" transient="false" />
+			<DO name="Beh" type="DO2" transient="false"/>
 		</LNodeType>
 		<DOType cdc="LPL" id="DO1">
 			<DA fc="DC" dchg="false" qchg="false" dupd="false" name="configRev" bType="VisString255" valKind="RO" valImport="false" />
@@ -114,12 +97,10 @@
 			<DA fc="ST" dchg="true" qchg="false" dupd="false" name="stVal" bType="Enum" type="BehaviourModeKind" valImport="true" />
 		</DOType>
 		<EnumType id="BehaviourModeKind">
-			<EnumVal ord="2">blocked</EnumVal>
-			<EnumVal ord="3">test</EnumVal>
-			<EnumVal ord="4">test/blocked</EnumVal>
-			<EnumVal ord="5">off</EnumVal>
 			<EnumVal ord="1">on</EnumVal>
+			<EnumVal ord="3">blocked</EnumVal>
+			<EnumVal ord="4">test</EnumVal>
+			<EnumVal ord="5">test/blocked</EnumVal>
 		</EnumType>
-
 	</DataTypeTemplates>
 </SCL>
diff --git a/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_KO_MissingBeh.scd b/sct-commons/src/test/resources/scd-refresh-lnode/Test_NOK_LDevice_presentInSubstationAndEnumNotContainOn.scd
similarity index 77%
rename from sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_KO_MissingBeh.scd
rename to sct-commons/src/test/resources/scd-refresh-lnode/Test_NOK_LDevice_presentInSubstationAndEnumNotContainOn.scd
index 9e88bb19e..36f8e9388 100644
--- a/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_KO_MissingBeh.scd
+++ b/sct-commons/src/test/resources/scd-refresh-lnode/Test_NOK_LDevice_presentInSubstationAndEnumNotContainOn.scd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- SPDX-FileCopyrightText: 2022 RTE FRANCE -->
+<!-- SPDX-FileCopyrightText: 2022 2023 2024 2025 TE FRANCE -->
 <!-- -->
 <!-- SPDX-License-Identifier: Apache-2.0 -->
 <SCL xmlns:compas="https://www.lfenergy.org/compas/extension/v1" xmlns="http://www.iec.ch/61850/2003/SCL" version="2007" revision="B" release="4">
@@ -12,9 +12,6 @@
 		</History>
 	</Header>
 	<Substation name="SITE">
-		<Private type="RTE-ExportSite">
-			<rte:ExportSite xmlns:rte="http://www.rte-france.com" Indice="2" Label="PALLU" UUID="d66637d5-2387-409e-99c3-f3d67079013a" />
-		</Private>
 		<VoltageLevel nomFreq="50" numPhases="3" name="0">
 			<Voltage unit="V" multiplier="k">0</Voltage>
 			<Bay name="BAY_1">
@@ -31,12 +28,12 @@
 					</Private>
 					<LNode iedName="IedName1" ldInst="LDSUIED" lnClass="LLN0" lnInst="">
 						<Private type="COMPAS-ICDHeader">
-                            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed"
-                                              IEDSystemVersioninstance="1" IEDType="SAMU" IEDSubstationinstance="3"
-                                              IEDName="IedName1" VendorName="RTE" IEDmodel="ICDfromModeling"
-                                              IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00"
-                                              headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
-                                              headerRevision="01.00.00"/>
+							<compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed"
+											  IEDSystemVersioninstance="1" IEDType="SAMU" IEDSubstationinstance="3"
+											  IEDName="IedName1" VendorName="RTE" IEDmodel="ICDfromModeling"
+											  IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00"
+											  headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+											  headerRevision="01.00.00"/>
 						</Private>
 					</LNode>
 				</Function>
@@ -76,9 +73,6 @@
 			<Server>
 				<Authentication />
 				<LDevice inst="LDSUIED" ldName="IedName1LDSUIED" desc="IED Monitoring Function">
-					<Private type="COMPAS-LDevice">
-						<compas:LDevice xmlns:compas="https://www.lfenergy.org/compas/extension/v1" LDeviceID="IedName1LDSUIED" LDeviceStatus="ACTIVE"/>
-					</Private>
 					<LN0 lnClass="LLN0" inst="" lnType="LNType1" desc="Logical node zero">
 						<DOI name="NamPlt">
 							<DAI name="swRev">
@@ -99,11 +93,11 @@
 		</AccessPoint>
 		<AccessPoint name="ADMIN_AP" />
 	</IED>
-
 	<DataTypeTemplates>
 		<LNodeType lnClass="LLN0" id="LNType1">
 			<DO name="NamPlt" type="DO1" transient="false" />
 			<DO name="Mod" type="DO2" transient="false" />
+			<DO name="Beh" type="DO2" transient="false"/>
 		</LNodeType>
 		<DOType cdc="LPL" id="DO1">
 			<DA fc="DC" dchg="false" qchg="false" dupd="false" name="configRev" bType="VisString255" valKind="RO" valImport="false" />
@@ -113,12 +107,10 @@
 			<DA fc="ST" dchg="true" qchg="false" dupd="false" name="stVal" bType="Enum" type="BehaviourModeKind" valImport="true" />
 		</DOType>
 		<EnumType id="BehaviourModeKind">
-			<EnumVal ord="2">blocked</EnumVal>
-			<EnumVal ord="3">test</EnumVal>
-			<EnumVal ord="4">test/blocked</EnumVal>
-			<EnumVal ord="5">off</EnumVal>
-			<EnumVal ord="1">on</EnumVal>
+			<EnumVal ord="2">off</EnumVal>
+			<EnumVal ord="3">blocked</EnumVal>
+			<EnumVal ord="4">test</EnumVal>
+			<EnumVal ord="5">test/blocked</EnumVal>
 		</EnumType>
-
 	</DataTypeTemplates>
 </SCL>
diff --git a/sct-commons/src/test/resources/scd-refresh-lnode/Test_NOK_MissingBeh.scd b/sct-commons/src/test/resources/scd-refresh-lnode/Test_NOK_MissingBeh.scd
new file mode 100644
index 000000000..46e938be8
--- /dev/null
+++ b/sct-commons/src/test/resources/scd-refresh-lnode/Test_NOK_MissingBeh.scd
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- SPDX-FileCopyrightText: 2022 2023 2024 2025 TE FRANCE -->
+<!-- -->
+<!-- SPDX-License-Identifier: Apache-2.0 -->
+<SCL xmlns:compas="https://www.lfenergy.org/compas/extension/v1" xmlns="http://www.iec.ch/61850/2003/SCL" version="2007" revision="B" release="4">
+    <Private type="COMPAS-SclFileType">
+        <compas:SclFileType>SCD</compas:SclFileType>
+    </Private>
+    <Header id="9ff3be19-a353-4b9c-b71b-af133855336a" version="5" revision="A" toolID="COMPAS">
+        <History>
+            <Hitem version="5" revision="A" when="Tue Aug 23 10:37:48 CEST 2022" who="" what="" why="" />
+        </History>
+    </Header>
+    <Substation name="SITE">
+        <VoltageLevel nomFreq="50" numPhases="3" name="0">
+            <Voltage unit="V" multiplier="k">0</Voltage>
+            <Bay name="BAY_1">
+                <Private type="COMPAS-Bay">
+                    <compas:Bay BayCodif="TG00000001" UUID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" Version="1"
+                                MainShortLabel="SITE1" SecondLabel="SITE-TGENE" NumBay="7" BayCount="1"/>
+                </Private>
+                <Private type="COMPAS-Criteria">
+                    <compas:Criteria ObjectID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" CriteriaAssociationID="CriteriaAssociationID" />
+                </Private>
+                <Function name="FUNCTION_1">
+                    <Private type="COMPAS-Function">
+                        <compas:Function UUID="8f4cda3f-828c-4006-9b87-2af96b19304b" Label="FUNCTION_1" />
+                    </Private>
+                    <LNode iedName="IedName1" ldInst="LDSUIED" lnClass="LLN0" lnInst="">
+                        <Private type="COMPAS-ICDHeader">
+                            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed"
+                                              IEDSystemVersioninstance="1" IEDType="SAMU" IEDSubstationinstance="3"
+                                              IEDName="IedName1" VendorName="RTE" IEDmodel="ICDfromModeling"
+                                              IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00"
+                                              headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+                                              headerRevision="01.00.00"/>
+                        </Private>
+                    </LNode>
+                </Function>
+            </Bay>
+        </VoltageLevel>
+    </Substation>
+    <Communication>
+        <SubNetwork type="8-MMS" name="RSPACE_PROCESS_NETWORK">
+            <ConnectedAP iedName="IedName1" apName="PROCESS_AP">
+                <Address>
+                    <P type="OSI-PSEL">00000001</P>
+                </Address>
+            </ConnectedAP>
+        </SubNetwork>
+        <SubNetwork type="IP" name="RSPACE_ADMIN_NETWORK">
+            <ConnectedAP iedName="IedName1" apName="ADMIN_AP">
+                <Address>
+                    <P type="SyslogIP">Adresse IP du serveur Syslog</P>
+                </Address>
+            </ConnectedAP>
+        </SubNetwork>
+    </Communication>
+    <IED name="IedName1" type="Valeur définie par le fournisseur" manufacturer="ADU" configVersion="ADU" originalSclVersion="2007" originalSclRevision="B" originalSclRelease="4" owner="ADU">
+        <Private type="RTE-IEDType">SAMU</Private>
+        <Private type="COMPAS-IEDType">SAMU</Private>
+        <Private type="COMPAS-SystemVersion">
+            <compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
+        </Private>
+        <Private type="COMPAS-ICDHeader">
+            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDSystemVersioninstance="1"
+                              IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName1" VendorName="RTE"
+                              IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00"
+                              swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+                              headerRevision="01.00.00"/>
+        </Private>
+        <AccessPoint name="PROCESS_AP">
+            <Server>
+                <Authentication />
+                <LDevice inst="LDSUIED" ldName="IedName1LDSUIED" desc="IED Monitoring Function">
+                    <LN0 lnClass="LLN0" inst="" lnType="LNType1" desc="Logical node zero">
+                        <DOI name="NamPlt">
+                            <DAI name="swRev">
+                                <Val>01.00.000</Val>
+                            </DAI>
+                            <DAI name="configRev">
+                                <Val>01.00.000</Val>
+                            </DAI>
+                        </DOI>
+                        <DOI name="Mod">
+                            <DAI name="stVal" valImport="true">
+                                <Val>off</Val>
+                            </DAI>
+                        </DOI>
+                    </LN0>
+                </LDevice>
+            </Server>
+        </AccessPoint>
+        <AccessPoint name="ADMIN_AP" />
+    </IED>
+
+    <DataTypeTemplates>
+        <LNodeType lnClass="LLN0" id="LNType1">
+            <DO name="NamPlt" type="DO1" transient="false" />
+            <DO name="Mod" type="DO2" transient="false" />
+        </LNodeType>
+        <DOType cdc="LPL" id="DO1">
+            <DA fc="DC" dchg="false" qchg="false" dupd="false" name="configRev" bType="VisString255" valKind="RO" valImport="false" />
+            <DA fc="DC" dchg="false" qchg="false" dupd="false" name="swRev" bType="VisString255" valKind="RO" valImport="false" />
+        </DOType>
+        <DOType cdc="ENC" id="DO2">
+            <DA fc="ST" dchg="true" qchg="false" dupd="false" name="stVal" bType="Enum" type="BehaviourModeKind" valImport="true" />
+        </DOType>
+        <EnumType id="BehaviourModeKind">
+            <EnumVal ord="2">blocked</EnumVal>
+            <EnumVal ord="3">test</EnumVal>
+            <EnumVal ord="4">test/blocked</EnumVal>
+            <EnumVal ord="5">off</EnumVal>
+            <EnumVal ord="1">on</EnumVal>
+        </EnumType>
+
+    </DataTypeTemplates>
+</SCL>
diff --git a/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_KO_MissingLDevicePrivate.scd b/sct-commons/src/test/resources/scd-refresh-lnode/Test_NOK_MissingEnums.scd
similarity index 84%
rename from sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_KO_MissingLDevicePrivate.scd
rename to sct-commons/src/test/resources/scd-refresh-lnode/Test_NOK_MissingEnums.scd
index 49cb8aac5..750045c25 100644
--- a/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_KO_MissingLDevicePrivate.scd
+++ b/sct-commons/src/test/resources/scd-refresh-lnode/Test_NOK_MissingEnums.scd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- SPDX-FileCopyrightText: 2022 RTE FRANCE -->
+<!-- SPDX-FileCopyrightText: 2022 2023 2024 2025 TE FRANCE -->
 <!-- -->
 <!-- SPDX-License-Identifier: Apache-2.0 -->
 <SCL xmlns:compas="https://www.lfenergy.org/compas/extension/v1" xmlns="http://www.iec.ch/61850/2003/SCL" version="2007" revision="B" release="4">
@@ -12,9 +12,6 @@
 		</History>
 	</Header>
 	<Substation name="SITE">
-		<Private type="RTE-ExportSite">
-			<rte:ExportSite xmlns:rte="http://www.rte-france.com" Indice="2" Label="PALLU" UUID="d66637d5-2387-409e-99c3-f3d67079013a" />
-		</Private>
 		<VoltageLevel nomFreq="50" numPhases="3" name="0">
 			<Voltage unit="V" multiplier="k">0</Voltage>
 			<Bay name="BAY_1">
@@ -31,10 +28,10 @@
 					</Private>
 					<LNode iedName="IedName1" ldInst="LDSUIED" lnClass="LLN0" lnInst="">
 						<Private type="COMPAS-ICDHeader">
-                            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed"
-                                              IEDSystemVersioninstance="1" IEDType="SAMU" IEDSubstationinstance="3"
-                                              IEDName="IedName1" VendorName="RTE" IEDmodel="ICDfromModeling"
-                                              IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00"
+                            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDType="SAMU"
+                                              IEDSubstationinstance="3" IEDSystemVersioninstance="1" IEDName="IedName2"
+                                              VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="B"
+                                              BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00"
                                               headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
                                               headerRevision="01.00.00"/>
 						</Private>
@@ -96,12 +93,11 @@
 		</AccessPoint>
 		<AccessPoint name="ADMIN_AP" />
 	</IED>
-
 	<DataTypeTemplates>
 		<LNodeType lnClass="LLN0" id="LNType1">
 			<DO name="NamPlt" type="DO1" transient="false" />
 			<DO name="Mod" type="DO2" transient="false" />
-			<DO name="Beh" type="DO2" transient="false" />
+			<DO name="Beh" type="DO2" transient="false"/>
 		</LNodeType>
 		<DOType cdc="LPL" id="DO1">
 			<DA fc="DC" dchg="false" qchg="false" dupd="false" name="configRev" bType="VisString255" valKind="RO" valImport="false" />
@@ -111,12 +107,9 @@
 			<DA fc="ST" dchg="true" qchg="false" dupd="false" name="stVal" bType="Enum" type="BehaviourModeKind" valImport="true" />
 		</DOType>
 		<EnumType id="BehaviourModeKind">
-			<EnumVal ord="2">blocked</EnumVal>
-			<EnumVal ord="3">test</EnumVal>
-			<EnumVal ord="4">test/blocked</EnumVal>
-			<EnumVal ord="5">off</EnumVal>
-			<EnumVal ord="1">on</EnumVal>
+			<EnumVal ord="3">blocked</EnumVal>
+			<EnumVal ord="4">test</EnumVal>
+			<EnumVal ord="5">test/blocked</EnumVal>
 		</EnumType>
-
 	</DataTypeTemplates>
 </SCL>
diff --git a/sct-commons/src/test/resources/scd-refresh-lnode/Test_NOK_MissingMod.scd b/sct-commons/src/test/resources/scd-refresh-lnode/Test_NOK_MissingMod.scd
new file mode 100644
index 000000000..2733a9a11
--- /dev/null
+++ b/sct-commons/src/test/resources/scd-refresh-lnode/Test_NOK_MissingMod.scd
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- SPDX-FileCopyrightText: 2022 2023 2024 2025 TE FRANCE -->
+<!-- -->
+<!-- SPDX-License-Identifier: Apache-2.0 -->
+<SCL xmlns:compas="https://www.lfenergy.org/compas/extension/v1" xmlns="http://www.iec.ch/61850/2003/SCL" version="2007" revision="B" release="4">
+    <Private type="COMPAS-SclFileType">
+        <compas:SclFileType>SCD</compas:SclFileType>
+    </Private>
+    <Header id="9ff3be19-a353-4b9c-b71b-af133855336a" version="5" revision="A" toolID="COMPAS">
+        <History>
+            <Hitem version="5" revision="A" when="Tue Aug 23 10:37:48 CEST 2022" who="" what="" why="" />
+        </History>
+    </Header>
+    <Substation name="SITE">
+        <VoltageLevel nomFreq="50" numPhases="3" name="0">
+            <Voltage unit="V" multiplier="k">0</Voltage>
+            <Bay name="BAY_1">
+                <Private type="COMPAS-Bay">
+                    <compas:Bay BayCodif="TG00000001" UUID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" Version="1"
+                                MainShortLabel="SITE1" SecondLabel="SITE-TGENE" NumBay="7" BayCount="1"/>
+                </Private>
+                <Private type="COMPAS-Criteria">
+                    <compas:Criteria ObjectID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" CriteriaAssociationID="CriteriaAssociationID" />
+                </Private>
+                <Function name="FUNCTION_1">
+                    <Private type="COMPAS-Function">
+                        <compas:Function UUID="8f4cda3f-828c-4006-9b87-2af96b19304b" Label="FUNCTION_1" />
+                    </Private>
+                    <LNode iedName="IedName1" ldInst="LDSUIED" lnClass="LLN0" lnInst="">
+                        <Private type="COMPAS-ICDHeader">
+                            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed"
+                                              IEDSystemVersioninstance="1" IEDType="SAMU" IEDSubstationinstance="3"
+                                              IEDName="IedName1" VendorName="RTE" IEDmodel="ICDfromModeling"
+                                              IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00"
+                                              headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+                                              headerRevision="01.00.00"/>
+                        </Private>
+                    </LNode>
+                </Function>
+            </Bay>
+        </VoltageLevel>
+    </Substation>
+    <Communication>
+        <SubNetwork type="8-MMS" name="RSPACE_PROCESS_NETWORK">
+            <ConnectedAP iedName="IedName1" apName="PROCESS_AP">
+                <Address>
+                    <P type="OSI-PSEL">00000001</P>
+                </Address>
+            </ConnectedAP>
+        </SubNetwork>
+        <SubNetwork type="IP" name="RSPACE_ADMIN_NETWORK">
+            <ConnectedAP iedName="IedName1" apName="ADMIN_AP">
+                <Address>
+                    <P type="SyslogIP">Adresse IP du serveur Syslog</P>
+                </Address>
+            </ConnectedAP>
+        </SubNetwork>
+    </Communication>
+    <IED name="IedName1" type="Valeur définie par le fournisseur" manufacturer="ADU" configVersion="ADU" originalSclVersion="2007" originalSclRevision="B" originalSclRelease="4" owner="ADU">
+        <Private type="RTE-IEDType">SAMU</Private>
+        <Private type="COMPAS-IEDType">SAMU</Private>
+        <Private type="COMPAS-SystemVersion">
+            <compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
+        </Private>
+        <Private type="COMPAS-ICDHeader">
+            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDSystemVersioninstance="1"
+                              IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName1" VendorName="RTE"
+                              IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00"
+                              swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+                              headerRevision="01.00.00"/>
+        </Private>
+        <AccessPoint name="PROCESS_AP">
+            <Server>
+                <Authentication />
+                <LDevice inst="LDSUIED" ldName="IedName1LDSUIED" desc="IED Monitoring Function">
+                    <LN0 lnClass="LLN0" inst="" lnType="LNType1" desc="Logical node zero">
+                        <Private type="COMPAS-LNodeStatus">on</Private>
+                        <DOI name="NamPlt">
+                            <DAI name="swRev">
+                                <Val>01.00.000</Val>
+                            </DAI>
+                            <DAI name="configRev">
+                                <Val>01.00.000</Val>
+                            </DAI>
+                        </DOI>
+                    </LN0>
+                </LDevice>
+            </Server>
+        </AccessPoint>
+        <AccessPoint name="ADMIN_AP" />
+    </IED>
+    <DataTypeTemplates>
+        <LNodeType lnClass="LLN0" id="LNType1">
+            <DO name="NamPlt" type="DO1" transient="false" />
+            <DO name="Mod" type="DO2" transient="false" />
+            <DO name="Beh" type="DO2" transient="false" />
+        </LNodeType>
+        <DOType cdc="LPL" id="DO1">
+            <DA fc="DC" dchg="false" qchg="false" dupd="false" name="configRev" bType="VisString255" valKind="RO" valImport="false" />
+            <DA fc="DC" dchg="false" qchg="false" dupd="false" name="swRev" bType="VisString255" valKind="RO" valImport="false" />
+        </DOType>
+        <DOType cdc="ENC" id="DO2">
+            <DA fc="ST" dchg="true" qchg="false" dupd="false" name="stVal" bType="Enum" type="BehaviourModeKind" valImport="true" />
+        </DOType>
+        <EnumType id="BehaviourModeKind">
+            <EnumVal ord="2">blocked</EnumVal>
+            <EnumVal ord="3">test</EnumVal>
+            <EnumVal ord="4">test/blocked</EnumVal>
+            <EnumVal ord="5">off</EnumVal>
+            <EnumVal ord="1">on</EnumVal>
+        </EnumType>
+
+    </DataTypeTemplates>
+</SCL>
diff --git a/sct-commons/src/test/resources/scd-refresh-lnode/Test_OK_LDevice_notPresentInSubstation.scd b/sct-commons/src/test/resources/scd-refresh-lnode/Test_OK_LDevice_notPresentInSubstation.scd
new file mode 100644
index 000000000..d53f1388d
--- /dev/null
+++ b/sct-commons/src/test/resources/scd-refresh-lnode/Test_OK_LDevice_notPresentInSubstation.scd
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- SPDX-FileCopyrightText: 2022 2023 2024 2025 TE FRANCE -->
+<!-- -->
+<!-- SPDX-License-Identifier: Apache-2.0 -->
+<SCL xmlns:compas="https://www.lfenergy.org/compas/extension/v1" xmlns="http://www.iec.ch/61850/2003/SCL" version="2007" revision="B" release="4">
+	<Private type="COMPAS-SclFileType">
+		<compas:SclFileType>SCD</compas:SclFileType>
+	</Private>
+	<Header id="9ff3be19-a353-4b9c-b71b-af133855336a" version="5" revision="A" toolID="COMPAS">
+		<History>
+			<Hitem version="5" revision="A" when="Tue Aug 23 10:37:48 CEST 2022" who="" what="" why="" />
+		</History>
+	</Header>
+	<Substation name="SITE">
+		<VoltageLevel nomFreq="50" numPhases="3" name="0">
+			<Voltage unit="V" multiplier="k">0</Voltage>
+			<Bay name="BAY_1">
+				<Private type="COMPAS-Bay">
+					<compas:Bay BayCodif="TG00000001" UUID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" Version="1"
+                                MainShortLabel="SITE1" SecondLabel="SITE-TGENE" NumBay="7" BayCount="1"/>
+				</Private>
+				<Private type="COMPAS-Criteria">
+					<compas:Criteria ObjectID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" CriteriaAssociationID="CriteriaAssociationID" />
+				</Private>
+				<Function name="FUNCTION_1">
+					<Private type="COMPAS-Function">
+						<compas:Function UUID="8f4cda3f-828c-4006-9b87-2af96b19304b" Label="FUNCTION_1" />
+					</Private>
+				</Function>
+			</Bay>
+		</VoltageLevel>
+	</Substation>
+	<Communication>
+		<SubNetwork type="8-MMS" name="RSPACE_PROCESS_NETWORK">
+			<ConnectedAP iedName="IedName1" apName="PROCESS_AP">
+				<Address>
+					<P type="OSI-PSEL">00000001</P>
+				</Address>
+			</ConnectedAP>
+		</SubNetwork>
+		<SubNetwork type="IP" name="RSPACE_ADMIN_NETWORK">
+			<ConnectedAP iedName="IedName1" apName="ADMIN_AP">
+				<Address>
+					<P type="SyslogIP">Adresse IP du serveur Syslog</P>
+				</Address>
+			</ConnectedAP>
+		</SubNetwork>
+	</Communication>
+	<IED name="IedName1" type="Valeur définie par le fournisseur" manufacturer="ADU" configVersion="ADU" originalSclVersion="2007" originalSclRevision="B" originalSclRelease="4" owner="ADU">
+		<Private type="RTE-IEDType">SAMU</Private>
+		<Private type="COMPAS-IEDType">SAMU</Private>
+		<Private type="COMPAS-SystemVersion">
+			<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
+		</Private>
+		<Private type="COMPAS-ICDHeader">
+            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDSystemVersioninstance="1"
+                              IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName1" VendorName="RTE"
+                              IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00"
+                              swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+                              headerRevision="01.00.00"/>
+		</Private>
+		<AccessPoint name="PROCESS_AP">
+			<Server>
+				<Authentication />
+				<LDevice inst="LDSUIED" ldName="IedName1LDSUIED" desc="IED Monitoring Function">
+					<LN0 lnClass="LLN0" inst="" lnType="LNType1" desc="Logical node zero">
+						<DOI name="NamPlt">
+							<DAI name="swRev">
+								<Val>01.00.000</Val>
+							</DAI>
+							<DAI name="configRev">
+								<Val>01.00.000</Val>
+							</DAI>
+						</DOI>
+						<DOI name="Mod">
+							<DAI name="stVal" valImport="true">
+								<Val>on</Val>
+							</DAI>
+						</DOI>
+					</LN0>
+				</LDevice>
+			</Server>
+		</AccessPoint>
+		<AccessPoint name="ADMIN_AP" />
+	</IED>
+	<DataTypeTemplates>
+		<LNodeType lnClass="LLN0" id="LNType1">
+			<DO name="NamPlt" type="DO1" transient="false" />
+			<DO name="Mod" type="DO2" transient="false" />
+			<DO name="Beh" type="DO2" transient="false"/>
+		</LNodeType>
+		<DOType cdc="LPL" id="DO1">
+			<DA fc="DC" dchg="false" qchg="false" dupd="false" name="configRev" bType="VisString255" valKind="RO" valImport="false" />
+			<DA fc="DC" dchg="false" qchg="false" dupd="false" name="swRev" bType="VisString255" valKind="RO" valImport="false" />
+		</DOType>
+		<DOType cdc="ENC" id="DO2">
+			<DA fc="ST" dchg="true" qchg="false" dupd="false" name="stVal" bType="Enum" type="BehaviourModeKind" valImport="true" />
+		</DOType>
+		<EnumType id="BehaviourModeKind">
+			<EnumVal ord="1">on</EnumVal>
+			<EnumVal ord="2">off</EnumVal>
+			<EnumVal ord="3">blocked</EnumVal>
+			<EnumVal ord="4">test</EnumVal>
+			<EnumVal ord="5">test/blocked</EnumVal>
+		</EnumType>
+	</DataTypeTemplates>
+</SCL>
diff --git a/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_KO_MissingMod.scd b/sct-commons/src/test/resources/scd-refresh-lnode/Test_OK_LDevice_presentInSubstation.scd
similarity index 78%
rename from sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_KO_MissingMod.scd
rename to sct-commons/src/test/resources/scd-refresh-lnode/Test_OK_LDevice_presentInSubstation.scd
index 27b6c193d..df9bccb62 100644
--- a/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_KO_MissingMod.scd
+++ b/sct-commons/src/test/resources/scd-refresh-lnode/Test_OK_LDevice_presentInSubstation.scd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- SPDX-FileCopyrightText: 2022 RTE FRANCE -->
+<!-- SPDX-FileCopyrightText: 2022 2023 2024 2025 TE FRANCE -->
 <!-- -->
 <!-- SPDX-License-Identifier: Apache-2.0 -->
 <SCL xmlns:compas="https://www.lfenergy.org/compas/extension/v1" xmlns="http://www.iec.ch/61850/2003/SCL" version="2007" revision="B" release="4">
@@ -12,15 +12,12 @@
 		</History>
 	</Header>
 	<Substation name="SITE">
-		<Private type="RTE-ExportSite">
-			<rte:ExportSite xmlns:rte="http://www.rte-france.com" Indice="2" Label="PALLU" UUID="d66637d5-2387-409e-99c3-f3d67079013a" />
-		</Private>
 		<VoltageLevel nomFreq="50" numPhases="3" name="0">
 			<Voltage unit="V" multiplier="k">0</Voltage>
 			<Bay name="BAY_1">
 				<Private type="COMPAS-Bay">
 					<compas:Bay BayCodif="TG00000001" UUID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" Version="1"
-								MainShortLabel="SITE1" SecondLabel="SITE-TGENE" NumBay="7" BayCount="1"/>
+                                MainShortLabel="SITE1" SecondLabel="SITE-TGENE" NumBay="7" BayCount="1"/>
 				</Private>
 				<Private type="COMPAS-Criteria">
 					<compas:Criteria ObjectID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" CriteriaAssociationID="CriteriaAssociationID" />
@@ -66,19 +63,16 @@
 			<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
 		</Private>
 		<Private type="COMPAS-ICDHeader">
-			<compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDSystemVersioninstance="1"
-							  IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName1" VendorName="RTE"
-							  IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00"
-							  swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
-							  headerRevision="01.00.00"/>
+            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDSystemVersioninstance="1"
+                              IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName1" VendorName="RTE"
+                              IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00"
+                              swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+                              headerRevision="01.00.00"/>
 		</Private>
 		<AccessPoint name="PROCESS_AP">
 			<Server>
 				<Authentication />
 				<LDevice inst="LDSUIED" ldName="IedName1LDSUIED" desc="IED Monitoring Function">
-					<Private type="COMPAS-LDevice">
-						<compas:LDevice xmlns:compas="https://www.lfenergy.org/compas/extension/v1" LDeviceID="IedName1LDSUIED" LDeviceStatus="ACTIVE"/>
-					</Private>
 					<LN0 lnClass="LLN0" inst="" lnType="LNType1" desc="Logical node zero">
 						<DOI name="NamPlt">
 							<DAI name="swRev">
@@ -99,11 +93,11 @@
 		</AccessPoint>
 		<AccessPoint name="ADMIN_AP" />
 	</IED>
-
 	<DataTypeTemplates>
 		<LNodeType lnClass="LLN0" id="LNType1">
 			<DO name="NamPlt" type="DO1" transient="false" />
-			<DO name="Beh" type="DO2" transient="false" />
+			<DO name="Mod" type="DO2" transient="false" />
+			<DO name="Beh" type="DO2" transient="false"/>
 		</LNodeType>
 		<DOType cdc="LPL" id="DO1">
 			<DA fc="DC" dchg="false" qchg="false" dupd="false" name="configRev" bType="VisString255" valKind="RO" valImport="false" />
@@ -113,12 +107,11 @@
 			<DA fc="ST" dchg="true" qchg="false" dupd="false" name="stVal" bType="Enum" type="BehaviourModeKind" valImport="true" />
 		</DOType>
 		<EnumType id="BehaviourModeKind">
-			<EnumVal ord="2">blocked</EnumVal>
-			<EnumVal ord="3">test</EnumVal>
-			<EnumVal ord="4">test/blocked</EnumVal>
-			<EnumVal ord="5">off</EnumVal>
 			<EnumVal ord="1">on</EnumVal>
+			<EnumVal ord="2">off</EnumVal>
+			<EnumVal ord="3">blocked</EnumVal>
+			<EnumVal ord="4">test</EnumVal>
+			<EnumVal ord="5">test/blocked</EnumVal>
 		</EnumType>
-
 	</DataTypeTemplates>
 </SCL>
diff --git a/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test1_LD_STATUS_INACTIVE.scd b/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test1_LD_STATUS_INACTIVE.scd
deleted file mode 100644
index 33fc9cba8..000000000
--- a/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test1_LD_STATUS_INACTIVE.scd
+++ /dev/null
@@ -1,247 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- SPDX-FileCopyrightText: 2022 RTE FRANCE -->
-<!-- -->
-<!-- SPDX-License-Identifier: Apache-2.0 -->
-<SCL xmlns:compas="https://www.lfenergy.org/compas/extension/v1" xmlns="http://www.iec.ch/61850/2003/SCL" version="2007" revision="B" release="4">
-	<Private type="COMPAS-SclFileType">
-		<compas:SclFileType>SCD</compas:SclFileType>
-	</Private>
-	<Header id="9ff3be19-a353-4b9c-b71b-af133855336a" version="5" revision="A" toolID="COMPAS">
-		<History>
-			<Hitem version="5" revision="A" when="Tue Aug 23 10:37:48 CEST 2022" who="" what="" why="" />
-		</History>
-	</Header>
-	<Substation name="SITE">
-		<Private type="RTE-ExportSite">
-			<rte:ExportSite xmlns:rte="http://www.rte-france.com" Indice="2" Label="PALLU" UUID="d66637d5-2387-409e-99c3-f3d67079013a" />
-		</Private>
-		<VoltageLevel nomFreq="50" numPhases="3" name="0">
-			<Voltage unit="V" multiplier="k">0</Voltage>
-			<Bay name="BAY_1">
-				<Private type="COMPAS-Bay">
-					<compas:Bay BayCodif="TG00000001" UUID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" Version="1"
-                                MainShortLabel="SITE1" SecondLabel="SITE-TGENE" NumBay="7" BayCount="1"/>
-				</Private>
-				<Private type="COMPAS-Criteria">
-					<compas:Criteria ObjectID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" CriteriaAssociationID="CriteriaAssociationID" />
-				</Private>
-				<Function name="FUNCTION_1">
-					<Private type="COMPAS-Function">
-						<compas:Function UUID="8f4cda3f-828c-4006-9b87-2af96b19304b" Label="FUNCTION_1" />
-					</Private>
-					<LNode iedName="IedName1" ldInst="LDSUIED" lnClass="LLN0" lnInst="">
-						<Private type="COMPAS-ICDHeader">
-                            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed"
-                                              IEDSystemVersioninstance="1" IEDType="SAMU" IEDSubstationinstance="3"
-                                              IEDName="IedName1" VendorName="RTE" IEDmodel="ICDfromModeling"
-                                              IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00"
-                                              headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
-                                              headerRevision="01.00.00"/>
-						</Private>
-					</LNode>
-					<LNode iedName="IedName2" ldInst="LDSUIED" lnClass="LLN0" lnInst="">
-						<Private type="COMPAS-ICDHeader">
-                            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed"
-                                              IEDSystemVersioninstance="1" IEDType="SAMU" IEDSubstationinstance="3"
-                                              IEDName="IedName2" VendorName="RTE" IEDmodel="ICDfromModeling"
-                                              IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00"
-                                              headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
-                                              headerRevision="01.00.00"/>
-						</Private>
-					</LNode>
-				</Function>
-			</Bay>
-		</VoltageLevel>
-	</Substation>
-	<Communication>
-		<SubNetwork type="8-MMS" name="RSPACE_PROCESS_NETWORK">
-			<ConnectedAP iedName="IedName2" apName="PROCESS_AP">
-				<Address>
-					<P type="OSI-PSEL">00000001</P>
-				</Address>
-			</ConnectedAP>
-			<ConnectedAP iedName="IedName1" apName="PROCESS_AP">
-				<Address>
-					<P type="OSI-PSEL">00000001</P>
-				</Address>
-			</ConnectedAP>
-		</SubNetwork>
-		<SubNetwork type="IP" name="RSPACE_ADMIN_NETWORK">
-			<ConnectedAP iedName="IedName2" apName="ADMIN_AP">
-				<Address>
-					<P type="SyslogIP">Adresse IP du serveur Syslog</P>
-				</Address>
-			</ConnectedAP>
-			<ConnectedAP iedName="IedName1" apName="ADMIN_AP">
-				<Address>
-					<P type="SyslogIP">Adresse IP du serveur Syslog</P>
-				</Address>
-			</ConnectedAP>
-		</SubNetwork>
-	</Communication>
-	<IED name="IedName1" type="Valeur définie par le fournisseur" manufacturer="ADU" configVersion="ADU" originalSclVersion="2007" originalSclRevision="B" originalSclRelease="4" owner="ADU">
-		<Private type="RTE-IEDType">SAMU</Private>
-		<Private type="COMPAS-IEDType">SAMU</Private>
-		<Private type="COMPAS-SystemVersion">
-			<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
-		</Private>
-		<Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDSystemVersioninstance="1"
-                              IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName1" VendorName="RTE"
-                              IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00"
-                              swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
-                              headerRevision="01.00.00"/>
-		</Private>
-		<AccessPoint name="PROCESS_AP">
-			<Server>
-				<Authentication />
-				<LDevice inst="LDSUIED" ldName="IedName1LDSUIED" desc="IED Monitoring Function">
-					<Private type="COMPAS-LDevice">
-						<compas:LDevice xmlns:compas="https://www.lfenergy.org/compas/extension/v1" LDeviceID="IedName1LDSUIED" LDeviceStatus="INACTIVE"/>
-					</Private>
-					<LN0 lnClass="LLN0" inst="" lnType="LNType1" desc="Logical node zero">
-						<DOI name="NamPlt">
-							<DAI name="swRev">
-								<Val>01.00.000</Val>
-							</DAI>
-							<DAI name="configRev">
-								<Val>01.00.000</Val>
-							</DAI>
-						</DOI>
-						<DOI name="Mod">
-							<DAI name="stVal" valImport="true">
-								<Val>off</Val>
-							</DAI>
-						</DOI>
-					</LN0>
-				</LDevice>
-			</Server>
-		</AccessPoint>
-		<AccessPoint name="ADMIN_AP" />
-	</IED>
-
-	<IED name="IedName2" type="Valeur définie par le fournisseur" manufacturer="ADU" configVersion="ADU" originalSclVersion="2007" originalSclRevision="B" originalSclRelease="4" owner="ADU">
-		<Private type="RTE-IEDType">SAMU</Private>
-		<Private type="COMPAS-IEDType">SAMU</Private>
-		<Private type="COMPAS-SystemVersion">
-			<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
-		</Private>
-		<Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" IEDSystemVersioninstance="1"
-                              IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName2" VendorName="RTE"
-                              IEDmodel="ICDfromModeling" IEDredundancy="A" BayLabel="SITE1" hwRev="01.00.00"
-                              swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
-                              headerRevision="01.00.00"/>
-		</Private>
-		<AccessPoint name="PROCESS_AP">
-			<Server>
-				<Authentication />
-				<LDevice inst="LDSUIED" ldName="IedName2LDSUIED" desc="IED Monitoring Function">
-					<Private type="COMPAS-LDevice">
-						<compas:LDevice xmlns:compas="https://www.lfenergy.org/compas/extension/v1" LDeviceID="IedName2LDSUIED" LDeviceStatus="INACTIVE"/>
-					</Private>
-					<LN0 lnClass="LLN0" inst="" lnType="LNType2" desc="Logical node zero">
-						<DOI name="NamPlt">
-							<DAI name="swRev">
-								<Val>01.00.000</Val>
-							</DAI>
-							<DAI name="configRev">
-								<Val>01.00.000</Val>
-							</DAI>
-						</DOI>
-						<DOI name="Mod">
-							<DAI name="stVal" valImport="true">
-								<Val>on</Val>
-							</DAI>
-						</DOI>
-					</LN0>
-				</LDevice>
-			</Server>
-		</AccessPoint>
-		<AccessPoint name="ADMIN_AP" />
-	</IED>
-
-	<IED name="IedName3" type="Valeur définie par le fournisseur" manufacturer="ADU" configVersion="ADU" originalSclVersion="2007" originalSclRevision="B" originalSclRelease="4" owner="ADU">
-		<Private type="RTE-IEDType">SAMU</Private>
-		<Private type="COMPAS-IEDType">SAMU</Private>
-		<Private type="COMPAS-SystemVersion">
-			<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
-		</Private>
-		<Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" IEDSystemVersioninstance="1"
-                              IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName3" VendorName="RTE"
-                              IEDmodel="ICDfromModeling" IEDredundancy="A" BayLabel="SITE1" hwRev="01.00.00"
-                              swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
-                              headerRevision="01.00.00"/>
-		</Private>
-		<AccessPoint name="PROCESS_AP">
-			<Server>
-				<Authentication />
-				<LDevice inst="LDSUIED" ldName="IedName3LDSUIED" desc="IED Monitoring Function">
-					<Private type="COMPAS-LDevice">
-						<compas:LDevice xmlns:compas="https://www.lfenergy.org/compas/extension/v1" LDeviceID="IedName3LDSUIED" LDeviceStatus="INACTIVE"/>
-					</Private>
-					<LN0 lnClass="LLN0" inst="" lnType="LNType3" desc="Logical node zero">
-						<DOI name="NamPlt">
-							<DAI name="swRev">
-								<Val>01.00.000</Val>
-							</DAI>
-							<DAI name="configRev">
-								<Val>01.00.000</Val>
-							</DAI>
-						</DOI>
-					</LN0>
-				</LDevice>
-			</Server>
-		</AccessPoint>
-		<AccessPoint name="ADMIN_AP" />
-	</IED>
-
-	<DataTypeTemplates>
-		<LNodeType lnClass="LLN0" id="LNType1">
-			<DO name="NamPlt" type="DO1" transient="false" />
-			<DO name="Mod" type="DO2" transient="false" />
-			<DO name="Beh" type="DO2" transient="false"/>
-		</LNodeType>
-		<LNodeType lnClass="LLN0" id="LNType2">
-			<DO name="NamPlt" type="DO1" transient="false" />
-			<DO name="Mod" type="DO3" transient="false" />
-			<DO name="Beh" type="DO3" transient="false"/>
-		</LNodeType>
-		<LNodeType lnClass="LLN0" id="LNType3">
-			<DO name="NamPlt" type="DO1" transient="false" />
-			<DO name="Mod" type="DO4" transient="false" />
-			<DO name="Beh" type="DO4" transient="false"/>
-		</LNodeType>
-		<DOType cdc="LPL" id="DO1">
-			<DA fc="DC" dchg="false" qchg="false" dupd="false" name="configRev" bType="VisString255" valKind="RO" valImport="false" />
-			<DA fc="DC" dchg="false" qchg="false" dupd="false" name="swRev" bType="VisString255" valKind="RO" valImport="false" />
-		</DOType>
-		<DOType cdc="ENC" id="DO2">
-			<DA fc="ST" dchg="true" qchg="false" dupd="false" name="stVal" bType="Enum" type="BehaviourModeKind" valImport="true" />
-		</DOType>
-		<DOType cdc="ENC" id="DO3">
-			<DA fc="ST" dchg="true" qchg="false" dupd="false" name="stVal" bType="Enum" type="BehaviourModeKind2" valImport="true"/>
-		</DOType>
-		<DOType cdc="ENC" id="DO4">
-			<DA fc="ST" dchg="true" qchg="false" dupd="false" name="stVal" bType="Enum" type="BehaviourModeKind3" valImport="true"/>
-		</DOType>
-		<EnumType id="BehaviourModeKind">
-			<EnumVal ord="1">on</EnumVal>
-			<EnumVal ord="3">blocked</EnumVal>
-			<EnumVal ord="4">test</EnumVal>
-			<EnumVal ord="5">test/blocked</EnumVal>
-		</EnumType>
-		<EnumType id="BehaviourModeKind2">
-			<EnumVal ord="2">off</EnumVal>
-			<EnumVal ord="3">blocked</EnumVal>
-			<EnumVal ord="4">test</EnumVal>
-			<EnumVal ord="5">test/blocked</EnumVal>
-		</EnumType>
-		<EnumType id="BehaviourModeKind3">
-			<EnumVal ord="3">blocked</EnumVal>
-			<EnumVal ord="4">test</EnumVal>
-			<EnumVal ord="5">test/blocked</EnumVal>
-		</EnumType>
-	</DataTypeTemplates>
-</SCL>
diff --git a/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test2_LD_STATUS_INACTIVE.scd b/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test2_LD_STATUS_INACTIVE.scd
deleted file mode 100644
index 72b928c71..000000000
--- a/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test2_LD_STATUS_INACTIVE.scd
+++ /dev/null
@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- SPDX-FileCopyrightText: 2022 RTE FRANCE -->
-<!-- -->
-<!-- SPDX-License-Identifier: Apache-2.0 -->
-<SCL xmlns:compas="https://www.lfenergy.org/compas/extension/v1" xmlns="http://www.iec.ch/61850/2003/SCL" version="2007" revision="B" release="4">
-	<Private type="COMPAS-SclFileType">
-		<compas:SclFileType>SCD</compas:SclFileType>
-	</Private>
-	<Header id="9ff3be19-a353-4b9c-b71b-af133855336a" version="5" revision="A" toolID="COMPAS">
-		<History>
-			<Hitem version="5" revision="A" when="Tue Aug 23 10:37:48 CEST 2022" who="" what="" why="" />
-		</History>
-	</Header>
-	<Substation name="SITE">
-		<Private type="RTE-ExportSite">
-			<rte:ExportSite xmlns:rte="http://www.rte-france.com" Indice="2" Label="PALLU" UUID="d66637d5-2387-409e-99c3-f3d67079013a" />
-		</Private>
-		<VoltageLevel nomFreq="50" numPhases="3" name="0">
-			<Voltage unit="V" multiplier="k">0</Voltage>
-			<Bay name="BAY_1">
-				<Private type="COMPAS-Bay">
-					<compas:Bay BayCodif="TG00000001" UUID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" Version="1"
-                                MainShortLabel="SITE1" SecondLabel="SITE-TGENE" NumBay="7" BayCount="1"/>
-				</Private>
-				<Private type="COMPAS-Criteria">
-					<compas:Criteria ObjectID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" CriteriaAssociationID="CriteriaAssociationID" />
-				</Private>
-				<Function name="FUNCTION_1">
-					<Private type="COMPAS-Function">
-						<compas:Function UUID="8f4cda3f-828c-4006-9b87-2af96b19304b" Label="FUNCTION_1" />
-					</Private>
-					<LNode iedName="IedName2" ldInst="LDSUIED" lnClass="LLN0" lnInst="">
-						<Private type="COMPAS-ICDHeader">
-                            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed"
-                                              IEDSystemVersioninstance="1" IEDType="SAMU" IEDSubstationinstance="3"
-                                              IEDName="IedName2" VendorName="RTE" IEDmodel="ICDfromModeling"
-                                              IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00"
-                                              headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
-                                              headerRevision="01.00.00"/>
-						</Private>
-					</LNode>
-				</Function>
-			</Bay>
-		</VoltageLevel>
-	</Substation>
-	<Communication>
-		<SubNetwork type="8-MMS" name="RSPACE_PROCESS_NETWORK">
-			<ConnectedAP iedName="IedName2" apName="PROCESS_AP">
-				<Address>
-					<P type="OSI-PSEL">00000001</P>
-				</Address>
-			</ConnectedAP>
-			<ConnectedAP iedName="IedName1" apName="PROCESS_AP">
-				<Address>
-					<P type="OSI-PSEL">00000001</P>
-				</Address>
-			</ConnectedAP>
-		</SubNetwork>
-		<SubNetwork type="IP" name="RSPACE_ADMIN_NETWORK">
-			<ConnectedAP iedName="IedName2" apName="ADMIN_AP">
-				<Address>
-					<P type="SyslogIP">Adresse IP du serveur Syslog</P>
-				</Address>
-			</ConnectedAP>
-			<ConnectedAP iedName="IedName1" apName="ADMIN_AP">
-				<Address>
-					<P type="SyslogIP">Adresse IP du serveur Syslog</P>
-				</Address>
-			</ConnectedAP>
-		</SubNetwork>
-	</Communication>
-	<IED name="IedName1" type="Valeur définie par le fournisseur" manufacturer="ADU" configVersion="ADU" originalSclVersion="2007" originalSclRevision="B" originalSclRelease="4" owner="ADU">
-		<Private type="RTE-IEDType">SAMU</Private>
-		<Private type="COMPAS-IEDType">SAMU</Private>
-		<Private type="COMPAS-SystemVersion">
-			<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
-		</Private>
-		<Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDSystemVersioninstance="1"
-                              IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName1" VendorName="RTE"
-                              IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00"
-                              swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
-                              headerRevision="01.00.00"/>
-		</Private>
-		<AccessPoint name="PROCESS_AP">
-			<Server>
-				<Authentication />
-				<LDevice inst="LDSUIED" ldName="IedName1LDSUIED" desc="IED Monitoring Function">
-					<Private type="COMPAS-LDevice">
-						<compas:LDevice xmlns:compas="https://www.lfenergy.org/compas/extension/v1" LDeviceID="IedName1LDSUIED" LDeviceStatus="INACTIVE"/>
-					</Private>
-					<LN0 lnClass="LLN0" inst="" lnType="LNType1" desc="Logical node zero">
-						<DOI name="NamPlt">
-							<DAI name="swRev">
-								<Val>01.00.000</Val>
-							</DAI>
-							<DAI name="configRev">
-								<Val>01.00.000</Val>
-							</DAI>
-						</DOI>
-						<DOI name="Mod">
-							<DAI name="stVal" valImport="true">
-								<Val>off</Val>
-							</DAI>
-						</DOI>
-					</LN0>
-				</LDevice>
-			</Server>
-		</AccessPoint>
-		<AccessPoint name="ADMIN_AP" />
-	</IED>
-
-	<IED name="IedName2" type="Valeur définie par le fournisseur" manufacturer="ADU" configVersion="ADU" originalSclVersion="2007" originalSclRevision="B" originalSclRelease="4" owner="ADU">
-		<Private type="RTE-IEDType">SAMU</Private>
-		<Private type="COMPAS-IEDType">SAMU</Private>
-		<Private type="COMPAS-SystemVersion">
-			<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
-		</Private>
-		<Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" IEDSystemVersioninstance="1"
-                              IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName2" VendorName="RTE"
-                              IEDmodel="ICDfromModeling" IEDredundancy="A" BayLabel="SITE1" hwRev="01.00.00"
-                              swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
-                              headerRevision="01.00.00"/>
-		</Private>
-		<AccessPoint name="PROCESS_AP">
-			<Server>
-				<Authentication />
-				<LDevice inst="LDSUIED" ldName="IedName2LDSUIED" desc="IED Monitoring Function">
-					<Private type="COMPAS-LDevice">
-						<compas:LDevice xmlns:compas="https://www.lfenergy.org/compas/extension/v1" LDeviceID="IedName2LDSUIED" LDeviceStatus="INACTIVE"/>
-					</Private>
-					<LN0 lnClass="LLN0" inst="" lnType="LNType2" desc="Logical node zero">
-						<DOI name="NamPlt">
-							<DAI name="swRev">
-								<Val>01.00.000</Val>
-							</DAI>
-							<DAI name="configRev">
-								<Val>01.00.000</Val>
-							</DAI>
-						</DOI>
-						<DOI name="Mod">
-							<DAI name="stVal" valImport="true">
-								<Val>on</Val>
-							</DAI>
-						</DOI>
-					</LN0>
-				</LDevice>
-			</Server>
-		</AccessPoint>
-		<AccessPoint name="ADMIN_AP" />
-	</IED>
-
-	<IED name="IedName3" type="Valeur définie par le fournisseur" manufacturer="ADU" configVersion="ADU" originalSclVersion="2007" originalSclRevision="B" originalSclRelease="4" owner="ADU">
-		<Private type="RTE-IEDType">SAMU</Private>
-		<Private type="COMPAS-IEDType">SAMU</Private>
-		<Private type="COMPAS-SystemVersion">
-			<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
-		</Private>
-		<Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" IEDSystemVersioninstance="1"
-                              IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName3" VendorName="RTE"
-                              IEDmodel="ICDfromModeling" IEDredundancy="A" BayLabel="SITE1" hwRev="01.00.00"
-                              swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
-                              headerRevision="01.00.00"/>
-		</Private>
-		<AccessPoint name="PROCESS_AP">
-			<Server>
-				<Authentication />
-				<LDevice inst="LDSUIED" ldName="IedName3LDSUIED" desc="IED Monitoring Function">
-					<Private type="COMPAS-LDevice">
-						<compas:LDevice xmlns:compas="https://www.lfenergy.org/compas/extension/v1" LDeviceID="IedName3LDSUIED" LDeviceStatus="INACTIVE"/>
-					</Private>
-					<LN0 lnClass="LLN0" inst="" lnType="LNType3" desc="Logical node zero">
-						<DOI name="NamPlt">
-							<DAI name="swRev">
-								<Val>01.00.000</Val>
-							</DAI>
-							<DAI name="configRev">
-								<Val>01.00.000</Val>
-							</DAI>
-						</DOI>
-					</LN0>
-				</LDevice>
-			</Server>
-		</AccessPoint>
-		<AccessPoint name="ADMIN_AP" />
-	</IED>
-
-	<DataTypeTemplates>
-		<LNodeType lnClass="LLN0" id="LNType1">
-			<DO name="NamPlt" type="DO1" transient="false" />
-			<DO name="Mod" type="DO2" transient="false" />
-			<DO name="Beh" type="DO2" transient="false"/>
-		</LNodeType>
-		<LNodeType lnClass="LLN0" id="LNType2">
-			<DO name="NamPlt" type="DO1" transient="false" />
-			<DO name="Mod" type="DO3" transient="false" />
-			<DO name="Beh" type="DO3" transient="false"/>
-		</LNodeType>
-		<LNodeType lnClass="LLN0" id="LNType3">
-			<DO name="NamPlt" type="DO1" transient="false" />
-			<DO name="Mod" type="DO4" transient="false" />
-			<DO name="Beh" type="DO4" transient="false"/>
-		</LNodeType>
-		<DOType cdc="LPL" id="DO1">
-			<DA fc="DC" dchg="false" qchg="false" dupd="false" name="configRev" bType="VisString255" valKind="RO" valImport="false" />
-			<DA fc="DC" dchg="false" qchg="false" dupd="false" name="swRev" bType="VisString255" valKind="RO" valImport="false" />
-		</DOType>
-		<DOType cdc="ENC" id="DO2">
-			<DA fc="ST" dchg="true" qchg="false" dupd="false" name="stVal" bType="Enum" type="BehaviourModeKind" valImport="true" />
-		</DOType>
-		<DOType cdc="ENC" id="DO3">
-			<DA fc="ST" dchg="true" qchg="false" dupd="false" name="stVal" bType="Enum" type="BehaviourModeKind2" valImport="true"/>
-		</DOType>
-		<DOType cdc="ENC" id="DO4">
-			<DA fc="ST" dchg="true" qchg="false" dupd="false" name="stVal" bType="Enum" type="BehaviourModeKind3" valImport="true"/>
-		</DOType>
-		<EnumType id="BehaviourModeKind">
-			<EnumVal ord="1">on</EnumVal>
-			<EnumVal ord="3">blocked</EnumVal>
-			<EnumVal ord="4">test</EnumVal>
-			<EnumVal ord="5">test/blocked</EnumVal>
-		</EnumType>
-		<EnumType id="BehaviourModeKind2">
-			<EnumVal ord="1">on</EnumVal>
-			<EnumVal ord="2">off</EnumVal>
-			<EnumVal ord="3">blocked</EnumVal>
-			<EnumVal ord="4">test</EnumVal>
-			<EnumVal ord="5">test/blocked</EnumVal>
-		</EnumType>
-		<EnumType id="BehaviourModeKind3">
-			<EnumVal ord="1">on</EnumVal>
-			<EnumVal ord="2">off</EnumVal>
-			<EnumVal ord="3">blocked</EnumVal>
-			<EnumVal ord="4">test</EnumVal>
-			<EnumVal ord="5">test/blocked</EnumVal>
-		</EnumType>
-	</DataTypeTemplates>
-</SCL>
diff --git a/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_Dai_Not_Updatable.scd b/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_Dai_Not_Updatable.scd
deleted file mode 100644
index 730ca6fd7..000000000
--- a/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_Dai_Not_Updatable.scd
+++ /dev/null
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- SPDX-FileCopyrightText: 2022 RTE FRANCE -->
-<!-- -->
-<!-- SPDX-License-Identifier: Apache-2.0 -->
-<SCL xmlns:compas="https://www.lfenergy.org/compas/extension/v1" xmlns="http://www.iec.ch/61850/2003/SCL" version="2007" revision="B" release="4">
-	<Private type="COMPAS-SclFileType">
-		<compas:SclFileType>SCD</compas:SclFileType>
-	</Private>
-	<Header id="9ff3be19-a353-4b9c-b71b-af133855336a" version="5" revision="A" toolID="COMPAS">
-		<History>
-			<Hitem version="5" revision="A" when="Tue Aug 23 10:37:48 CEST 2022" who="" what="" why="" />
-		</History>
-	</Header>
-	<Substation name="SITE">
-		<Private type="RTE-ExportSite">
-			<rte:ExportSite xmlns:rte="http://www.rte-france.com" Indice="2" Label="PALLU" UUID="d66637d5-2387-409e-99c3-f3d67079013a" />
-		</Private>
-		<VoltageLevel nomFreq="50" numPhases="3" name="0">
-			<Voltage unit="V" multiplier="k">0</Voltage>
-			<Bay name="BAY_1">
-				<Private type="COMPAS-Bay">
-					<compas:Bay BayCodif="TG00000001" UUID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" Version="1" MainShortLabel="SITE1" SecondLabel="SITE-TGENE" NumBay="7" />
-				</Private>
-				<Private type="COMPAS-Criteria">
-					<compas:Criteria ObjectID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" CriteriaAssociationID="CriteriaAssociationID" />
-				</Private>
-				<Function name="FUNCTION_1">
-					<Private type="COMPAS-Function">
-						<compas:Function UUID="8f4cda3f-828c-4006-9b87-2af96b19304b" Label="FUNCTION_1" />
-					</Private>
-					<LNode iedName="IedName1" ldInst="LDSUIED" lnClass="LLN0" lnInst="">
-						<Private type="COMPAS-ICDHeader">
-							<compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName1" VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00" headerRevision="01.00.00"></compas:ICDHeader>
-						</Private>
-					</LNode>
-				</Function>
-			</Bay>
-		</VoltageLevel>
-	</Substation>
-	<Communication>
-		<SubNetwork type="8-MMS" name="RSPACE_PROCESS_NETWORK">
-			<ConnectedAP iedName="IedName2" apName="PROCESS_AP">
-				<Address>
-					<P type="OSI-PSEL">00000001</P>
-				</Address>
-			</ConnectedAP>
-			<ConnectedAP iedName="IedName1" apName="PROCESS_AP">
-				<Address>
-					<P type="OSI-PSEL">00000001</P>
-				</Address>
-			</ConnectedAP>
-		</SubNetwork>
-		<SubNetwork type="IP" name="RSPACE_ADMIN_NETWORK">
-			<ConnectedAP iedName="IedName2" apName="ADMIN_AP">
-				<Address>
-					<P type="SyslogIP">Adresse IP du serveur Syslog</P>
-				</Address>
-			</ConnectedAP>
-			<ConnectedAP iedName="IedName1" apName="ADMIN_AP">
-				<Address>
-					<P type="SyslogIP">Adresse IP du serveur Syslog</P>
-				</Address>
-			</ConnectedAP>
-		</SubNetwork>
-	</Communication>
-	<IED name="IedName1" type="Valeur définie par le fournisseur" manufacturer="ADU" configVersion="ADU" originalSclVersion="2007" originalSclRevision="B" originalSclRelease="4" owner="ADU">
-		<Private type="RTE-IEDType">SAMU</Private>
-		<Private type="COMPAS-IEDType">SAMU</Private>
-		<Private type="COMPAS-SystemVersion">
-			<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
-		</Private>
-		<Private type="COMPAS-ICDHeader">
-			<compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName1" VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00" headerRevision="01.00.00"></compas:ICDHeader>
-		</Private>
-		<AccessPoint name="PROCESS_AP">
-			<Server>
-				<Authentication />
-				<LDevice inst="LDSUIED" ldName="IedName1LDSUIED" desc="IED Monitoring Function">
-					<Private type="COMPAS-LDevice">
-						<compas:LDevice xmlns:compas="https://www.lfenergy.org/compas/extension/v1" LDeviceID="IedName1LDSUIED" LDeviceStatus="ACTIVE"/>
-					</Private>
-					<LN0 lnClass="LLN0" inst="" lnType="LNType1" desc="Logical node zero">
-						<DOI name="NamPlt">
-							<DAI name="swRev">
-								<Val>01.00.000</Val>
-							</DAI>
-							<DAI name="configRev">
-								<Val>01.00.000</Val>
-							</DAI>
-						</DOI>
-						<DOI name="Mod">
-							<DAI name="stVal">
-								<Val>off</Val>
-							</DAI>
-						</DOI>
-					</LN0>
-				</LDevice>
-			</Server>
-		</AccessPoint>
-		<AccessPoint name="ADMIN_AP" />
-	</IED>
-
-	<IED name="IedName2" type="Valeur définie par le fournisseur" manufacturer="ADU" configVersion="ADU" originalSclVersion="2007" originalSclRevision="B" originalSclRelease="4" owner="ADU">
-		<Private type="RTE-IEDType">SAMU</Private>
-		<Private type="COMPAS-IEDType">SAMU</Private>
-		<Private type="COMPAS-SystemVersion">
-			<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
-		</Private>
-		<Private type="COMPAS-ICDHeader">
-			<compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName2" VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="A" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00" headerRevision="01.00.00"></compas:ICDHeader>
-		</Private>
-		<AccessPoint name="PROCESS_AP">
-			<Server>
-				<Authentication />
-				<LDevice inst="LDSUIED" ldName="IedName2LDSUIED" desc="IED Monitoring Function">
-					<Private type="COMPAS-LDevice">
-						<compas:LDevice xmlns:compas="https://www.lfenergy.org/compas/extension/v1" LDeviceID="IedName2LDSUIED" LDeviceStatus="INACTIVE"/>
-					</Private>
-					<LN0 lnClass="LLN0" inst="" lnType="LNType2" desc="Logical node zero">
-						<DOI name="NamPlt">
-							<DAI name="swRev">
-								<Val>01.00.000</Val>
-							</DAI>
-							<DAI name="configRev">
-								<Val>01.00.000</Val>
-							</DAI>
-						</DOI>
-						<DOI name="Mod">
-							<DAI name="stVal">
-								<Val>on</Val>
-							</DAI>
-						</DOI>
-					</LN0>
-				</LDevice>
-			</Server>
-		</AccessPoint>
-		<AccessPoint name="ADMIN_AP" />
-	</IED>
-
-	<IED name="IedName3" type="Valeur définie par le fournisseur" manufacturer="ADU" configVersion="ADU" originalSclVersion="2007" originalSclRevision="B" originalSclRelease="4" owner="ADU">
-		<Private type="RTE-IEDType">SAMU</Private>
-		<Private type="COMPAS-IEDType">SAMU</Private>
-		<Private type="COMPAS-SystemVersion">
-			<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
-		</Private>
-		<Private type="COMPAS-ICDHeader">
-			<compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName3" VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="A" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00" headerRevision="01.00.00"></compas:ICDHeader>
-		</Private>
-		<AccessPoint name="PROCESS_AP">
-			<Server>
-				<Authentication />
-				<LDevice inst="LDSUIED" ldName="IedName3LDSUIED" desc="IED Monitoring Function">
-					<Private type="COMPAS-LDevice">
-						<compas:LDevice xmlns:compas="https://www.lfenergy.org/compas/extension/v1" LDeviceID="IedName3LDSUIED" LDeviceStatus="UNTESTED"/>
-					</Private>
-					<LN0 lnClass="LLN0" inst="" lnType="LNType3" desc="Logical node zero">
-						<DOI name="NamPlt">
-							<DAI name="swRev">
-								<Val>01.00.000</Val>
-							</DAI>
-							<DAI name="configRev">
-								<Val>01.00.000</Val>
-							</DAI>
-						</DOI>
-					</LN0>
-				</LDevice>
-			</Server>
-		</AccessPoint>
-		<AccessPoint name="ADMIN_AP" />
-	</IED>
-
-	<DataTypeTemplates>
-		<LNodeType lnClass="LLN0" id="LNType1">
-			<DO name="NamPlt" type="DO1" transient="false" />
-			<DO name="Mod" type="DO2" transient="false" />
-			<DO name="Beh" type="DO2" transient="false"/>
-		</LNodeType>
-		<LNodeType lnClass="LLN0" id="LNType2">
-			<DO name="NamPlt" type="DO1" transient="false" />
-			<DO name="Mod" type="DO3" transient="false" />
-			<DO name="Beh" type="DO3" transient="false"/>
-		</LNodeType>
-		<LNodeType lnClass="LLN0" id="LNType3">
-			<DO name="NamPlt" type="DO1" transient="false" />
-			<DO name="Mod" type="DO4" transient="false" />
-			<DO name="Beh" type="DO4" transient="false"/>
-		</LNodeType>
-		<DOType cdc="LPL" id="DO1">
-			<DA fc="DC" dchg="false" qchg="false" dupd="false" name="configRev" bType="VisString255" valKind="RO" valImport="false" />
-			<DA fc="DC" dchg="false" qchg="false" dupd="false" name="swRev" bType="VisString255" valKind="RO" valImport="false" />
-		</DOType>
-		<DOType cdc="ENC" id="DO2">
-			<DA fc="ST" dchg="true" qchg="false" dupd="false" name="stVal" bType="Enum" type="BehaviourModeKind" valImport="false" />
-		</DOType>
-		<DOType cdc="ENC" id="DO3">
-			<DA fc="ST" dchg="true" qchg="false" dupd="false" name="stVal" bType="Enum" type="BehaviourModeKind2" valImport="false"/>
-		</DOType>
-		<DOType cdc="ENC" id="DO4">
-			<DA fc="ST" dchg="true" qchg="false" dupd="false" name="stVal" bType="Enum" type="BehaviourModeKind3" valImport="false"/>
-		</DOType>
-		<EnumType id="BehaviourModeKind">
-			<EnumVal ord="1">on</EnumVal>
-			<EnumVal ord="2">off</EnumVal>
-			<EnumVal ord="3">blocked</EnumVal>
-			<EnumVal ord="4">test</EnumVal>
-			<EnumVal ord="5">test/blocked</EnumVal>
-		</EnumType>
-		<EnumType id="BehaviourModeKind2">
-			<EnumVal ord="1">on</EnumVal>
-			<EnumVal ord="2">off</EnumVal>
-			<EnumVal ord="3">blocked</EnumVal>
-			<EnumVal ord="4">test</EnumVal>
-			<EnumVal ord="5">test/blocked</EnumVal>
-		</EnumType>
-		<EnumType id="BehaviourModeKind3">
-			<EnumVal ord="1">on</EnumVal>
-			<EnumVal ord="2">off</EnumVal>
-			<EnumVal ord="3">blocked</EnumVal>
-			<EnumVal ord="4">test</EnumVal>
-			<EnumVal ord="5">test/blocked</EnumVal>
-		</EnumType>
-	</DataTypeTemplates>
-</SCL>
diff --git a/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_LD_STATUS_ACTIVE.scd b/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_LD_STATUS_ACTIVE.scd
deleted file mode 100644
index 87ca28bf1..000000000
--- a/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_LD_STATUS_ACTIVE.scd
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- SPDX-FileCopyrightText: 2022 RTE FRANCE -->
-<!-- -->
-<!-- SPDX-License-Identifier: Apache-2.0 -->
-<SCL xmlns:compas="https://www.lfenergy.org/compas/extension/v1" xmlns="http://www.iec.ch/61850/2003/SCL" version="2007" revision="B" release="4">
-	<Private type="COMPAS-SclFileType">
-		<compas:SclFileType>SCD</compas:SclFileType>
-	</Private>
-	<Header id="9ff3be19-a353-4b9c-b71b-af133855336a" version="5" revision="A" toolID="COMPAS">
-		<History>
-			<Hitem version="5" revision="A" when="Tue Aug 23 10:37:48 CEST 2022" who="" what="" why="" />
-		</History>
-	</Header>
-	<Substation name="SITE">
-		<Private type="RTE-ExportSite">
-			<rte:ExportSite xmlns:rte="http://www.rte-france.com" Indice="2" Label="PALLU" UUID="d66637d5-2387-409e-99c3-f3d67079013a" />
-		</Private>
-		<VoltageLevel nomFreq="50" numPhases="3" name="0">
-			<Voltage unit="V" multiplier="k">0</Voltage>
-			<Bay name="BAY_1">
-				<Private type="COMPAS-Bay">
-					<compas:Bay BayCodif="TG00000001" UUID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" Version="1"
-                                MainShortLabel="SITE1" SecondLabel="SITE-TGENE" NumBay="7" BayCount="1"/>
-				</Private>
-				<Private type="COMPAS-Criteria">
-					<compas:Criteria ObjectID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" CriteriaAssociationID="CriteriaAssociationID" />
-				</Private>
-				<Function name="FUNCTION_1">
-					<Private type="COMPAS-Function">
-						<compas:Function UUID="8f4cda3f-828c-4006-9b87-2af96b19304b" Label="FUNCTION_1" />
-					</Private>
-					<LNode iedName="IedName2" ldInst="LDSUIED" lnClass="LLN0" lnInst="">
-						<Private type="COMPAS-ICDHeader">
-                            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDType="SAMU"
-                                              IEDSubstationinstance="3" IEDSystemVersioninstance="1" IEDName="IedName2"
-                                              VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="B"
-                                              BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00"
-                                              headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
-                                              headerRevision="01.00.00"/>
-						</Private>
-					</LNode>
-				</Function>
-			</Bay>
-		</VoltageLevel>
-	</Substation>
-	<Communication>
-		<SubNetwork type="8-MMS" name="RSPACE_PROCESS_NETWORK">
-			<ConnectedAP iedName="IedName2" apName="PROCESS_AP">
-				<Address>
-					<P type="OSI-PSEL">00000001</P>
-				</Address>
-			</ConnectedAP>
-			<ConnectedAP iedName="IedName1" apName="PROCESS_AP">
-				<Address>
-					<P type="OSI-PSEL">00000001</P>
-				</Address>
-			</ConnectedAP>
-		</SubNetwork>
-		<SubNetwork type="IP" name="RSPACE_ADMIN_NETWORK">
-			<ConnectedAP iedName="IedName2" apName="ADMIN_AP">
-				<Address>
-					<P type="SyslogIP">Adresse IP du serveur Syslog</P>
-				</Address>
-			</ConnectedAP>
-			<ConnectedAP iedName="IedName1" apName="ADMIN_AP">
-				<Address>
-					<P type="SyslogIP">Adresse IP du serveur Syslog</P>
-				</Address>
-			</ConnectedAP>
-		</SubNetwork>
-	</Communication>
-	<IED name="IedName1" type="Valeur définie par le fournisseur" manufacturer="ADU" configVersion="ADU" originalSclVersion="2007" originalSclRevision="B" originalSclRelease="4" owner="ADU">
-		<Private type="RTE-IEDType">SAMU</Private>
-		<Private type="COMPAS-IEDType">SAMU</Private>
-		<Private type="COMPAS-SystemVersion">
-			<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
-		</Private>
-		<Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDSystemVersioninstance="1"
-                              IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName1" VendorName="RTE"
-                              IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00"
-                              swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
-                              headerRevision="01.00.00"/>
-		</Private>
-		<AccessPoint name="PROCESS_AP">
-			<Server>
-				<Authentication />
-				<LDevice inst="LDSUIED" ldName="IedName1LDSUIED" desc="IED Monitoring Function">
-					<Private type="COMPAS-LDevice">
-						<compas:LDevice xmlns:compas="https://www.lfenergy.org/compas/extension/v1" LDeviceID="IedName1LDSUIED" LDeviceStatus="ACTIVE"/>
-					</Private>
-					<LN0 lnClass="LLN0" inst="" lnType="LNType1" desc="Logical node zero">
-						<DOI name="NamPlt">
-							<DAI name="swRev">
-								<Val>01.00.000</Val>
-							</DAI>
-							<DAI name="configRev">
-								<Val>01.00.000</Val>
-							</DAI>
-						</DOI>
-						<DOI name="Mod">
-							<DAI name="stVal" valImport="true">
-								<Val>off</Val>
-							</DAI>
-						</DOI>
-					</LN0>
-				</LDevice>
-			</Server>
-		</AccessPoint>
-		<AccessPoint name="ADMIN_AP" />
-	</IED>
-
-	<IED name="IedName2" type="Valeur définie par le fournisseur" manufacturer="ADU" configVersion="ADU" originalSclVersion="2007" originalSclRevision="B" originalSclRelease="4" owner="ADU">
-		<Private type="RTE-IEDType">SAMU</Private>
-		<Private type="COMPAS-IEDType">SAMU</Private>
-		<Private type="COMPAS-SystemVersion">
-			<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
-		</Private>
-		<Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" IEDSystemVersioninstance="1"
-                              IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName2" VendorName="RTE"
-                              IEDmodel="ICDfromModeling" IEDredundancy="A" BayLabel="SITE1" hwRev="01.00.00"
-                              swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
-                              headerRevision="01.00.00"/>
-		</Private>
-		<AccessPoint name="PROCESS_AP">
-			<Server>
-				<Authentication />
-				<LDevice inst="LDSUIED" ldName="IedName2LDSUIED" desc="IED Monitoring Function">
-					<Private type="COMPAS-LDevice">
-						<compas:LDevice xmlns:compas="https://www.lfenergy.org/compas/extension/v1" LDeviceID="IedName2LDSUIED" LDeviceStatus="ACTIVE"/>
-					</Private>
-					<LN0 lnClass="LLN0" inst="" lnType="LNType2" desc="Logical node zero">
-						<DOI name="NamPlt">
-							<DAI name="swRev">
-								<Val>01.00.000</Val>
-							</DAI>
-							<DAI name="configRev">
-								<Val>01.00.000</Val>
-							</DAI>
-						</DOI>
-						<DOI name="Mod">
-							<DAI name="stVal" valImport="true">
-								<Val>on</Val>
-							</DAI>
-						</DOI>
-					</LN0>
-				</LDevice>
-			</Server>
-		</AccessPoint>
-		<AccessPoint name="ADMIN_AP" />
-	</IED>
-
-	<IED name="IedName3" type="Valeur définie par le fournisseur" manufacturer="ADU" configVersion="ADU" originalSclVersion="2007" originalSclRevision="B" originalSclRelease="4" owner="ADU">
-		<Private type="RTE-IEDType">SAMU</Private>
-		<Private type="COMPAS-IEDType">SAMU</Private>
-		<Private type="COMPAS-SystemVersion">
-			<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
-		</Private>
-		<Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" IEDSystemVersioninstance="1"
-                              IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName3" VendorName="RTE"
-                              IEDmodel="ICDfromModeling" IEDredundancy="A" BayLabel="SITE1" hwRev="01.00.00"
-                              swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
-                              headerRevision="01.00.00"/>
-		</Private>
-		<AccessPoint name="PROCESS_AP">
-			<Server>
-				<Authentication />
-				<LDevice inst="LDSUIED" ldName="IedName3LDSUIED" desc="IED Monitoring Function">
-					<Private type="COMPAS-LDevice">
-						<compas:LDevice xmlns:compas="https://www.lfenergy.org/compas/extension/v1" LDeviceID="IedName3LDSUIED" LDeviceStatus="ACTIVE"/>
-					</Private>
-					<LN0 lnClass="LLN0" inst="" lnType="LNType3" desc="Logical node zero">
-						<DOI name="NamPlt">
-							<DAI name="swRev">
-								<Val>01.00.000</Val>
-							</DAI>
-							<DAI name="configRev">
-								<Val>01.00.000</Val>
-							</DAI>
-						</DOI>
-					</LN0>
-				</LDevice>
-			</Server>
-		</AccessPoint>
-		<AccessPoint name="ADMIN_AP" />
-	</IED>
-
-	<DataTypeTemplates>
-		<LNodeType lnClass="LLN0" id="LNType1">
-			<DO name="NamPlt" type="DO1" transient="false" />
-			<DO name="Mod" type="DO2" transient="false" />
-			<DO name="Beh" type="DO2" transient="false"/>
-		</LNodeType>
-		<LNodeType lnClass="LLN0" id="LNType2">
-			<DO name="NamPlt" type="DO1" transient="false" />
-			<DO name="Mod" type="DO3" transient="false" />
-			<DO name="Beh" type="DO3" transient="false"/>
-		</LNodeType>
-		<LNodeType lnClass="LLN0" id="LNType3">
-			<DO name="NamPlt" type="DO1" transient="false" />
-			<DO name="Mod" type="DO4" transient="false" />
-			<DO name="Beh" type="DO4" transient="false"/>
-		</LNodeType>
-		<DOType cdc="LPL" id="DO1">
-			<DA fc="DC" dchg="false" qchg="false" dupd="false" name="configRev" bType="VisString255" valKind="RO" valImport="false" />
-			<DA fc="DC" dchg="false" qchg="false" dupd="false" name="swRev" bType="VisString255" valKind="RO" valImport="false" />
-		</DOType>
-		<DOType cdc="ENC" id="DO2">
-			<DA fc="ST" dchg="true" qchg="false" dupd="false" name="stVal" bType="Enum" type="BehaviourModeKind" valImport="true" />
-		</DOType>
-		<DOType cdc="ENC" id="DO3">
-			<DA fc="ST" dchg="true" qchg="false" dupd="false" name="stVal" bType="Enum" type="BehaviourModeKind2" valImport="true"/>
-		</DOType>
-		<DOType cdc="ENC" id="DO4">
-			<DA fc="ST" dchg="true" qchg="false" dupd="false" name="stVal" bType="Enum" type="BehaviourModeKind3" valImport="true"/>
-		</DOType>
-		<EnumType id="BehaviourModeKind">
-			<EnumVal ord="1">on</EnumVal>
-			<EnumVal ord="3">blocked</EnumVal>
-			<EnumVal ord="4">test</EnumVal>
-			<EnumVal ord="5">test/blocked</EnumVal>
-		</EnumType>
-		<EnumType id="BehaviourModeKind2">
-			<EnumVal ord="2">off</EnumVal>
-			<EnumVal ord="3">blocked</EnumVal>
-			<EnumVal ord="4">test</EnumVal>
-			<EnumVal ord="5">test/blocked</EnumVal>
-		</EnumType>
-		<EnumType id="BehaviourModeKind3">
-			<EnumVal ord="3">blocked</EnumVal>
-			<EnumVal ord="4">test</EnumVal>
-			<EnumVal ord="5">test/blocked</EnumVal>
-		</EnumType>
-	</DataTypeTemplates>
-</SCL>
diff --git a/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_LD_STATUS_UNTESTED.scd b/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_LD_STATUS_UNTESTED.scd
deleted file mode 100644
index c6f31cdb5..000000000
--- a/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_LD_STATUS_UNTESTED.scd
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- SPDX-FileCopyrightText: 2022 RTE FRANCE -->
-<!-- -->
-<!-- SPDX-License-Identifier: Apache-2.0 -->
-<SCL xmlns:compas="https://www.lfenergy.org/compas/extension/v1" xmlns="http://www.iec.ch/61850/2003/SCL" version="2007" revision="B" release="4">
-	<Private type="COMPAS-SclFileType">
-		<compas:SclFileType>SCD</compas:SclFileType>
-	</Private>
-	<Header id="9ff3be19-a353-4b9c-b71b-af133855336a" version="5" revision="A" toolID="COMPAS">
-		<History>
-			<Hitem version="5" revision="A" when="Tue Aug 23 10:37:48 CEST 2022" who="" what="" why="" />
-		</History>
-	</Header>
-	<Substation name="SITE">
-		<Private type="RTE-ExportSite">
-			<rte:ExportSite xmlns:rte="http://www.rte-france.com" Indice="2" Label="PALLU" UUID="d66637d5-2387-409e-99c3-f3d67079013a" />
-		</Private>
-		<VoltageLevel nomFreq="50" numPhases="3" name="0">
-			<Voltage unit="V" multiplier="k">0</Voltage>
-			<Bay name="BAY_1">
-				<Private type="COMPAS-Bay">
-					<compas:Bay BayCodif="TG00000001" UUID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" Version="1"
-                                MainShortLabel="SITE1" SecondLabel="SITE-TGENE" NumBay="7" BayCount="1"/>
-				</Private>
-				<Private type="COMPAS-Criteria">
-					<compas:Criteria ObjectID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" CriteriaAssociationID="CriteriaAssociationID" />
-				</Private>
-				<Function name="FUNCTION_1">
-					<Private type="COMPAS-Function">
-						<compas:Function UUID="8f4cda3f-828c-4006-9b87-2af96b19304b" Label="FUNCTION_1" />
-					</Private>
-					<LNode iedName="IedName2" ldInst="LDSUIED" lnClass="LLN0" lnInst="">
-						<Private type="COMPAS-ICDHeader">
-                            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed"
-                                              IEDSystemVersioninstance="1" IEDType="SAMU" IEDSubstationinstance="3"
-                                              IEDName="IedName2" VendorName="RTE" IEDmodel="ICDfromModeling"
-                                              IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00"
-                                              headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
-                                              headerRevision="01.00.00"/>
-						</Private>
-					</LNode>
-				</Function>
-			</Bay>
-		</VoltageLevel>
-	</Substation>
-	<Communication>
-		<SubNetwork type="8-MMS" name="RSPACE_PROCESS_NETWORK">
-			<ConnectedAP iedName="IedName2" apName="PROCESS_AP">
-				<Address>
-					<P type="OSI-PSEL">00000001</P>
-				</Address>
-			</ConnectedAP>
-			<ConnectedAP iedName="IedName1" apName="PROCESS_AP">
-				<Address>
-					<P type="OSI-PSEL">00000001</P>
-				</Address>
-			</ConnectedAP>
-		</SubNetwork>
-		<SubNetwork type="IP" name="RSPACE_ADMIN_NETWORK">
-			<ConnectedAP iedName="IedName2" apName="ADMIN_AP">
-				<Address>
-					<P type="SyslogIP">Adresse IP du serveur Syslog</P>
-				</Address>
-			</ConnectedAP>
-			<ConnectedAP iedName="IedName1" apName="ADMIN_AP">
-				<Address>
-					<P type="SyslogIP">Adresse IP du serveur Syslog</P>
-				</Address>
-			</ConnectedAP>
-		</SubNetwork>
-	</Communication>
-	<IED name="IedName1" type="Valeur définie par le fournisseur" manufacturer="ADU" configVersion="ADU" originalSclVersion="2007" originalSclRevision="B" originalSclRelease="4" owner="ADU">
-		<Private type="RTE-IEDType">SAMU</Private>
-		<Private type="COMPAS-IEDType">SAMU</Private>
-		<Private type="COMPAS-SystemVersion">
-			<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
-		</Private>
-		<Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDSystemVersioninstance="1"
-                              IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName1" VendorName="RTE"
-                              IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00"
-                              swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
-                              headerRevision="01.00.00"/>
-		</Private>
-		<AccessPoint name="PROCESS_AP">
-			<Server>
-				<Authentication />
-				<LDevice inst="LDSUIED" ldName="IedName1LDSUIED" desc="IED Monitoring Function">
-					<Private type="COMPAS-LDevice">
-						<compas:LDevice xmlns:compas="https://www.lfenergy.org/compas/extension/v1" LDeviceID="IedName1LDSUIED" LDeviceStatus="UNTESTED"/>
-					</Private>
-					<LN0 lnClass="LLN0" inst="" lnType="LNType1" desc="Logical node zero">
-						<DOI name="NamPlt">
-							<DAI name="swRev">
-								<Val>01.00.000</Val>
-							</DAI>
-							<DAI name="configRev">
-								<Val>01.00.000</Val>
-							</DAI>
-						</DOI>
-						<DOI name="Mod">
-							<DAI name="stVal" valImport="true">
-								<Val>off</Val>
-							</DAI>
-						</DOI>
-					</LN0>
-				</LDevice>
-			</Server>
-		</AccessPoint>
-		<AccessPoint name="ADMIN_AP" />
-	</IED>
-
-	<IED name="IedName2" type="Valeur définie par le fournisseur" manufacturer="ADU" configVersion="ADU" originalSclVersion="2007" originalSclRevision="B" originalSclRelease="4" owner="ADU">
-		<Private type="RTE-IEDType">SAMU</Private>
-		<Private type="COMPAS-IEDType">SAMU</Private>
-		<Private type="COMPAS-SystemVersion">
-			<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
-		</Private>
-		<Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" IEDSystemVersioninstance="1"
-                              IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName2" VendorName="RTE"
-                              IEDmodel="ICDfromModeling" IEDredundancy="A" BayLabel="SITE1" hwRev="01.00.00"
-                              swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
-                              headerRevision="01.00.00"/>
-		</Private>
-		<AccessPoint name="PROCESS_AP">
-			<Server>
-				<Authentication />
-				<LDevice inst="LDSUIED" ldName="IedName2LDSUIED" desc="IED Monitoring Function">
-					<Private type="COMPAS-LDevice">
-						<compas:LDevice xmlns:compas="https://www.lfenergy.org/compas/extension/v1" LDeviceID="IedName2LDSUIED" LDeviceStatus="UNTESTED"/>
-					</Private>
-					<LN0 lnClass="LLN0" inst="" lnType="LNType2" desc="Logical node zero">
-						<DOI name="NamPlt">
-							<DAI name="swRev">
-								<Val>01.00.000</Val>
-							</DAI>
-							<DAI name="configRev">
-								<Val>01.00.000</Val>
-							</DAI>
-						</DOI>
-						<DOI name="Mod">
-							<DAI name="stVal" valImport="true">
-								<Val>on</Val>
-							</DAI>
-						</DOI>
-					</LN0>
-				</LDevice>
-			</Server>
-		</AccessPoint>
-		<AccessPoint name="ADMIN_AP" />
-	</IED>
-
-	<IED name="IedName3" type="Valeur définie par le fournisseur" manufacturer="ADU" configVersion="ADU" originalSclVersion="2007" originalSclRevision="B" originalSclRelease="4" owner="ADU">
-		<Private type="RTE-IEDType">SAMU</Private>
-		<Private type="COMPAS-IEDType">SAMU</Private>
-		<Private type="COMPAS-SystemVersion">
-			<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
-		</Private>
-		<Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" IEDSystemVersioninstance="1"
-                              IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName3" VendorName="RTE"
-                              IEDmodel="ICDfromModeling" IEDredundancy="A" BayLabel="SITE1" hwRev="01.00.00"
-                              swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
-                              headerRevision="01.00.00"/>
-		</Private>
-		<AccessPoint name="PROCESS_AP">
-			<Server>
-				<Authentication />
-				<LDevice inst="LDSUIED" ldName="IedName3LDSUIED" desc="IED Monitoring Function">
-					<Private type="COMPAS-LDevice">
-						<compas:LDevice xmlns:compas="https://www.lfenergy.org/compas/extension/v1" LDeviceID="IedName3LDSUIED" LDeviceStatus="UNTESTED"/>
-					</Private>
-					<LN0 lnClass="LLN0" inst="" lnType="LNType3" desc="Logical node zero">
-						<DOI name="NamPlt">
-							<DAI name="swRev">
-								<Val>01.00.000</Val>
-							</DAI>
-							<DAI name="configRev">
-								<Val>01.00.000</Val>
-							</DAI>
-						</DOI>
-					</LN0>
-				</LDevice>
-			</Server>
-		</AccessPoint>
-		<AccessPoint name="ADMIN_AP" />
-	</IED>
-
-	<DataTypeTemplates>
-		<LNodeType lnClass="LLN0" id="LNType1">
-			<DO name="NamPlt" type="DO1" transient="false" />
-			<DO name="Mod" type="DO2" transient="false" />
-			<DO name="Beh" type="DO2" transient="false"/>
-		</LNodeType>
-		<LNodeType lnClass="LLN0" id="LNType2">
-			<DO name="NamPlt" type="DO1" transient="false" />
-			<DO name="Mod" type="DO3" transient="false" />
-			<DO name="Beh" type="DO3" transient="false"/>
-		</LNodeType>
-		<LNodeType lnClass="LLN0" id="LNType3">
-			<DO name="NamPlt" type="DO1" transient="false" />
-			<DO name="Mod" type="DO4" transient="false" />
-			<DO name="Beh" type="DO4" transient="false"/>
-		</LNodeType>
-		<DOType cdc="LPL" id="DO1">
-			<DA fc="DC" dchg="false" qchg="false" dupd="false" name="configRev" bType="VisString255" valKind="RO" valImport="false" />
-			<DA fc="DC" dchg="false" qchg="false" dupd="false" name="swRev" bType="VisString255" valKind="RO" valImport="false" />
-		</DOType>
-		<DOType cdc="ENC" id="DO2">
-			<DA fc="ST" dchg="true" qchg="false" dupd="false" name="stVal" bType="Enum" type="BehaviourModeKind" valImport="true" />
-		</DOType>
-		<DOType cdc="ENC" id="DO3">
-			<DA fc="ST" dchg="true" qchg="false" dupd="false" name="stVal" bType="Enum" type="BehaviourModeKind2" valImport="true"/>
-		</DOType>
-		<DOType cdc="ENC" id="DO4">
-			<DA fc="ST" dchg="true" qchg="false" dupd="false" name="stVal" bType="Enum" type="BehaviourModeKind3" valImport="true"/>
-		</DOType>
-		<EnumType id="BehaviourModeKind">
-			<EnumVal ord="1">on</EnumVal>
-			<EnumVal ord="3">blocked</EnumVal>
-			<EnumVal ord="4">test</EnumVal>
-			<EnumVal ord="5">test/blocked</EnumVal>
-		</EnumType>
-		<EnumType id="BehaviourModeKind2">
-			<EnumVal ord="2">off</EnumVal>
-			<EnumVal ord="3">blocked</EnumVal>
-			<EnumVal ord="4">test</EnumVal>
-			<EnumVal ord="5">test/blocked</EnumVal>
-		</EnumType>
-		<EnumType id="BehaviourModeKind3">
-			<EnumVal ord="3">blocked</EnumVal>
-			<EnumVal ord="4">test</EnumVal>
-			<EnumVal ord="5">test/blocked</EnumVal>
-		</EnumType>
-	</DataTypeTemplates>
-</SCL>