diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a0c56016c..2d2de49f9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,3 +1,10 @@
+#
+# Copyright (c) 2021, RTE (http://www.rte-france.com)
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
 name: CI
 
 on: [push]
diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml
index 85b56fe65..5d9a3ff33 100644
--- a/.github/workflows/clang-tidy.yml
+++ b/.github/workflows/clang-tidy.yml
@@ -1,3 +1,10 @@
+#
+# Copyright (c) 2021, RTE (http://www.rte-france.com)
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
 name: clang-tidy
 
 on:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab1b6e350..a01822dc0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ cmake_minimum_required(VERSION 3.12 FATAL_ERROR)
 project(powsybl-iidm4cpp)
 
 set(IIDM_VERSION_MAJOR 1)
-set(IIDM_VERSION_MINOR 4)
+set(IIDM_VERSION_MINOR 5)
 set(IIDM_VERSION_PATCH 0)
 set(IIDM_VERSION ${IIDM_VERSION_MAJOR}.${IIDM_VERSION_MINOR}.${IIDM_VERSION_PATCH})
 set(IIDM_SOVERSION ${IIDM_VERSION_MAJOR})
diff --git a/doxygen/Doxyfile.in b/doxygen/Doxyfile.in
index bfd417384..489146d85 100644
--- a/doxygen/Doxyfile.in
+++ b/doxygen/Doxyfile.in
@@ -1,3 +1,10 @@
+#
+# Copyright (c) 2021, RTE (http://www.rte-france.com)
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
 # Doxyfile 1.8.14
 
 # This file describes the settings to be used by the documentation system
diff --git a/doxygen/cppreference-doxygen-web.tag.xml b/doxygen/cppreference-doxygen-web.tag.xml
index 747688c90..531688fef 100644
--- a/doxygen/cppreference-doxygen-web.tag.xml
+++ b/doxygen/cppreference-doxygen-web.tag.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 License. -->
 <tagfile>
   <compound kind="namespace">
     <name>std</name>
diff --git a/doxygen/powsybl.svg b/doxygen/powsybl.svg
index 817fcede8..b18830248 100644
--- a/doxygen/powsybl.svg
+++ b/doxygen/powsybl.svg
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 22.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!--
+	Copyright (c) 2021, RTE (http://www.rte-france.com)
+	This Source Code Form is subject to the terms of the Mozilla Public
+	License, v. 2.0. If a copy of the MPL was not distributed with this
+	file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-->
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 114 114" style="enable-background:new 0 0 114 114;" xml:space="preserve">
 <style type="text/css">
diff --git a/examples/example1/eurostag-tutorial1.xml b/examples/example1/eurostag-tutorial1.xml
index 87d35e0a4..2ed9422d2 100644
--- a/examples/example1/eurostag-tutorial1.xml
+++ b/examples/example1/eurostag-tutorial1.xml
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+	Copyright (c) 2021, RTE (http://www.rte-france.com)
+	This Source Code Form is subject to the terms of the Mozilla Public
+	License, v. 2.0. If a copy of the MPL was not distributed with this
+	file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-->
 <iidm:network xmlns:iidm="http://www.itesla_project.eu/schema/iidm/1_0" id="sim1" caseDate="2013-01-15T18:45:00+01:00" forecastDistance="0" sourceFormat="test">
     <iidm:substation id="P1" country="FR" tso="RTE" geographicalTags="A">
         <iidm:voltageLevel id="VLGEN" nominalV="24" topologyKind="BUS_BREAKER">
diff --git a/examples/example2/CMakeLists.txt b/examples/example2/CMakeLists.txt
index 20c80b07d..7ddf00c49 100644
--- a/examples/example2/CMakeLists.txt
+++ b/examples/example2/CMakeLists.txt
@@ -12,6 +12,7 @@ project(my-project)
 
 # Find the required dependencies: Boost, LibXML2 and IIDM and import the targets
 find_package(Boost 1.65 REQUIRED COMPONENTS date_time filesystem program_options system unit_test_framework)
+find_package(Threads REQUIRED)
 find_package(LibXml2 REQUIRED)
 find_package(LibIIDM REQUIRED)
 
@@ -19,4 +20,4 @@ find_package(LibIIDM REQUIRED)
 add_executable(my-executable ../example1/example1.cpp)
 
 # Link the executable with the IIDM shared library
-target_link_libraries(my-executable PRIVATE IIDM::iidm-static)
+target_link_libraries(my-executable PRIVATE IIDM::iidm)
diff --git a/examples/example2/README.md b/examples/example2/README.md
index 0857a0aae..e544c4159 100644
--- a/examples/example2/README.md
+++ b/examples/example2/README.md
@@ -61,6 +61,7 @@ project(my-project)
 
 # Find the required dependencies: Boost, LibXML2 and IIDM and import the targets
 find_package(Boost 1.65 REQUIRED COMPONENTS date_time filesystem program_options system unit_test_framework)
+find_package(Threads REQUIRED)
 find_package(LibXml2 REQUIRED)
 find_package(LibIIDM REQUIRED)
 
@@ -82,6 +83,15 @@ $> cmake -DCMAKE_PREFIX_PATH=/tmp/powsybl-iidm4cpp
 --   program_options
 --   system
 --   unit_test_framework
+-- Looking for pthread.h
+-- Looking for pthread.h - found
+-- Looking for pthread_create
+-- Looking for pthread_create - not found
+-- Looking for pthread_create in pthreads
+-- Looking for pthread_create in pthreads - not found
+-- Looking for pthread_create in pthread
+-- Looking for pthread_create in pthread - found
+-- Found Threads: TRUE
 -- Configuring done
 -- Generating done
 -- Build files have been written to: /home/user/powsybl-iidm4cpp/examples/example2/build
@@ -139,6 +149,15 @@ $> cmake --build .
 --   program_options
 --   system
 --   unit_test_framework
+-- Looking for pthread.h
+-- Looking for pthread.h - found
+-- Looking for pthread_create
+-- Looking for pthread_create - not found
+-- Looking for pthread_create in pthreads
+-- Looking for pthread_create in pthreads - not found
+-- Looking for pthread_create in pthread
+-- Looking for pthread_create in pthread - found
+-- Found Threads: TRUE
 -- Configuring done
 -- Generating done
 -- Build files have been written to: /home/user/powsybl-iidm4cpp/examples/example2/build
diff --git a/extensions/entsoe/include/powsybl/iidm/extensions/entsoe/EntsoeAreaAdder.hpp b/extensions/entsoe/include/powsybl/iidm/extensions/entsoe/EntsoeAreaAdder.hpp
index 078bf3432..5dc0e10f3 100644
--- a/extensions/entsoe/include/powsybl/iidm/extensions/entsoe/EntsoeAreaAdder.hpp
+++ b/extensions/entsoe/include/powsybl/iidm/extensions/entsoe/EntsoeAreaAdder.hpp
@@ -27,11 +27,6 @@ class EntsoeAreaAdder : public ExtensionAdder {
      */
     explicit EntsoeAreaAdder(Extendable& extendable);
 
-    /**
-     * Destructor
-     */
-    ~EntsoeAreaAdder() noexcept override = default;
-
     /**
      * Copy constructor
      */
@@ -42,6 +37,11 @@ class EntsoeAreaAdder : public ExtensionAdder {
      */
     EntsoeAreaAdder(EntsoeAreaAdder&&) = default;
 
+    /**
+     * Destructor
+     */
+    ~EntsoeAreaAdder() noexcept override = default;
+
     /**
      * Copy assignment operator
      */
diff --git a/extensions/entsoe/include/powsybl/iidm/extensions/entsoe/EntsoeGeographicalCode.hpp b/extensions/entsoe/include/powsybl/iidm/extensions/entsoe/EntsoeGeographicalCode.hpp
index 5ad5e02dc..68f2230ef 100644
--- a/extensions/entsoe/include/powsybl/iidm/extensions/entsoe/EntsoeGeographicalCode.hpp
+++ b/extensions/entsoe/include/powsybl/iidm/extensions/entsoe/EntsoeGeographicalCode.hpp
@@ -39,6 +39,7 @@ enum class EntsoeGeographicalCode : unsigned int {
     HR,
     HU,
     IT,
+    KS,
     LU,
     LT,
     MA,
diff --git a/extensions/entsoe/include/powsybl/iidm/extensions/entsoe/MergedXnodeAdder.hpp b/extensions/entsoe/include/powsybl/iidm/extensions/entsoe/MergedXnodeAdder.hpp
index a1267be2f..f72623477 100644
--- a/extensions/entsoe/include/powsybl/iidm/extensions/entsoe/MergedXnodeAdder.hpp
+++ b/extensions/entsoe/include/powsybl/iidm/extensions/entsoe/MergedXnodeAdder.hpp
@@ -28,11 +28,6 @@ class MergedXnodeAdder : public ExtensionAdder {
      */
     explicit MergedXnodeAdder(Extendable& extendable);
 
-    /**
-     * Destructor
-     */
-    ~MergedXnodeAdder() noexcept override = default;
-
     /**
      * Copy constructor
      */
@@ -43,6 +38,11 @@ class MergedXnodeAdder : public ExtensionAdder {
      */
     MergedXnodeAdder(MergedXnodeAdder&&) noexcept = default;
 
+    /**
+     * Destructor
+     */
+    ~MergedXnodeAdder() noexcept override = default;
+
     /**
      * Copy assignment operator
      */
diff --git a/extensions/entsoe/include/powsybl/iidm/extensions/entsoe/XnodeAdder.hpp b/extensions/entsoe/include/powsybl/iidm/extensions/entsoe/XnodeAdder.hpp
index 7e73c3898..3a38b1004 100644
--- a/extensions/entsoe/include/powsybl/iidm/extensions/entsoe/XnodeAdder.hpp
+++ b/extensions/entsoe/include/powsybl/iidm/extensions/entsoe/XnodeAdder.hpp
@@ -27,11 +27,6 @@ class XnodeAdder : public ExtensionAdder {
      */
     explicit XnodeAdder(Extendable& extendable);
 
-    /**
-     * Destructor
-     */
-    ~XnodeAdder() noexcept override = default;
-
     /**
      * Copy constructor
      */
@@ -42,6 +37,11 @@ class XnodeAdder : public ExtensionAdder {
      */
     XnodeAdder(XnodeAdder&&) noexcept = default;
 
+    /**
+     * Destructor
+     */
+    ~XnodeAdder() noexcept override = default;
+
     /**
      * Copy assignment operator
      */
diff --git a/extensions/entsoe/resources/entsoeArea.xml b/extensions/entsoe/resources/entsoeArea.xml
index 01db8bf64..2416c5175 100644
--- a/extensions/entsoe/resources/entsoeArea.xml
+++ b/extensions/entsoe/resources/entsoeArea.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_4" xmlns:ea="http://www.itesla_project.eu/schema/iidm/ext/entsoe_area/1_0" id="test" caseDate="2016-06-27T12:27:58.535000+02:00" forecastDistance="0" sourceFormat="test">
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" xmlns:ea="http://www.itesla_project.eu/schema/iidm/ext/entsoe_area/1_0" id="test" caseDate="2016-06-27T12:27:58.535000+02:00" forecastDistance="0" sourceFormat="test">
     <iidm:substation id="S" country="FR"/>
     <iidm:extension id="S">
         <ea:entsoeArea>FR</ea:entsoeArea>
diff --git a/extensions/entsoe/resources/mergedXnode.xml b/extensions/entsoe/resources/mergedXnode.xml
index 293f35664..bdba9fcd5 100644
--- a/extensions/entsoe/resources/mergedXnode.xml
+++ b/extensions/entsoe/resources/mergedXnode.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_4" xmlns:mxn="http://www.itesla_project.eu/schema/iidm/ext/merged_xnode/1_0" id="test" caseDate="2016-06-27T12:27:58.535000+02:00" forecastDistance="0" sourceFormat="test">
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" xmlns:mxn="http://www.itesla_project.eu/schema/iidm/ext/merged_xnode/1_0" id="test" caseDate="2016-06-27T12:27:58.535000+02:00" forecastDistance="0" sourceFormat="test">
     <iidm:substation id="S1" country="FR">
         <iidm:voltageLevel id="VL1" nominalV="400" topologyKind="BUS_BREAKER">
             <iidm:busBreakerTopology>
diff --git a/extensions/entsoe/resources/xnode.xml b/extensions/entsoe/resources/xnode.xml
index 28b466dd4..44288523e 100644
--- a/extensions/entsoe/resources/xnode.xml
+++ b/extensions/entsoe/resources/xnode.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_4" xmlns:xn="http://www.itesla_project.eu/schema/iidm/ext/xnode/1_0" id="test" caseDate="2016-06-27T12:27:58.535000+02:00" forecastDistance="0" sourceFormat="test">
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" xmlns:xn="http://www.itesla_project.eu/schema/iidm/ext/xnode/1_0" id="test" caseDate="2016-06-27T12:27:58.535000+02:00" forecastDistance="0" sourceFormat="test">
     <iidm:substation id="S" country="FR">
         <iidm:voltageLevel id="VL" nominalV="400" topologyKind="BUS_BREAKER">
             <iidm:busBreakerTopology>
diff --git a/extensions/entsoe/src/EntsoeAreaXmlSerializer.cpp b/extensions/entsoe/src/EntsoeAreaXmlSerializer.cpp
index 91460c875..cb1cb1547 100644
--- a/extensions/entsoe/src/EntsoeAreaXmlSerializer.cpp
+++ b/extensions/entsoe/src/EntsoeAreaXmlSerializer.cpp
@@ -43,7 +43,7 @@ Extension& EntsoeAreaXmlSerializer::read(Extendable& extendable, converter::xml:
 
 void EntsoeAreaXmlSerializer::write(const Extension& extension, converter::xml::NetworkXmlWriterContext& context) const {
     const auto& entsoeArea = safeCast<EntsoeArea>(extension);
-    context.getExtensionsWriter().writeCharacters(Enum::toString<EntsoeGeographicalCode>(entsoeArea.getCode()));
+    context.getWriter().writeCharacters(Enum::toString<EntsoeGeographicalCode>(entsoeArea.getCode()));
 }
 
 }  // namespace entsoe
diff --git a/extensions/entsoe/src/EntsoeGeographicalCode.cpp b/extensions/entsoe/src/EntsoeGeographicalCode.cpp
index 7be8d109c..f40113672 100644
--- a/extensions/entsoe/src/EntsoeGeographicalCode.cpp
+++ b/extensions/entsoe/src/EntsoeGeographicalCode.cpp
@@ -40,6 +40,7 @@ const std::initializer_list<std::string>& getNames<powsybl::iidm::extensions::en
         "HR",
         "HU",
         "IT",
+        "KS",
         "LU",
         "LT",
         "MA",
diff --git a/extensions/entsoe/src/MergedXnodeXmlSerializer.cpp b/extensions/entsoe/src/MergedXnodeXmlSerializer.cpp
index dedf52aae..064a6cb07 100644
--- a/extensions/entsoe/src/MergedXnodeXmlSerializer.cpp
+++ b/extensions/entsoe/src/MergedXnodeXmlSerializer.cpp
@@ -45,13 +45,13 @@ Extension& MergedXnodeXmlSerializer::read(Extendable& extendable, converter::xml
 
 void MergedXnodeXmlSerializer::write(const Extension& extension, converter::xml::NetworkXmlWriterContext& context) const {
     const auto& mergedXnode = safeCast<MergedXnode>(extension);
-    context.getExtensionsWriter().writeAttribute("rdp", mergedXnode.getRdp());
-    context.getExtensionsWriter().writeAttribute("xdp", mergedXnode.getXdp());
-    context.getExtensionsWriter().writeAttribute("xnodeP1", mergedXnode.getXnodeP1());
-    context.getExtensionsWriter().writeAttribute("xnodeQ1", mergedXnode.getXnodeQ1());
-    context.getExtensionsWriter().writeAttribute("xnodeP2", mergedXnode.getXnodeP2());
-    context.getExtensionsWriter().writeAttribute("xnodeQ2", mergedXnode.getXnodeQ2());
-    context.getExtensionsWriter().writeAttribute("code", mergedXnode.getCode());
+    context.getWriter().writeAttribute("rdp", mergedXnode.getRdp());
+    context.getWriter().writeAttribute("xdp", mergedXnode.getXdp());
+    context.getWriter().writeAttribute("xnodeP1", mergedXnode.getXnodeP1());
+    context.getWriter().writeAttribute("xnodeQ1", mergedXnode.getXnodeQ1());
+    context.getWriter().writeAttribute("xnodeP2", mergedXnode.getXnodeP2());
+    context.getWriter().writeAttribute("xnodeQ2", mergedXnode.getXnodeQ2());
+    context.getWriter().writeAttribute("code", mergedXnode.getCode());
 }
 
 }  // namespace entsoe
diff --git a/extensions/entsoe/src/XnodeXmlSerializer.cpp b/extensions/entsoe/src/XnodeXmlSerializer.cpp
index d99ee9edd..9917530e0 100644
--- a/extensions/entsoe/src/XnodeXmlSerializer.cpp
+++ b/extensions/entsoe/src/XnodeXmlSerializer.cpp
@@ -38,7 +38,7 @@ Extension& XnodeXmlSerializer::read(Extendable& extendable, converter::xml::Netw
 
 void XnodeXmlSerializer::write(const Extension& extension, converter::xml::NetworkXmlWriterContext& context) const {
     const auto& xnode = safeCast<Xnode>(extension);
-    context.getExtensionsWriter().writeAttribute("code", xnode.getCode());
+    context.getWriter().writeAttribute("code", xnode.getCode());
 }
 
 }  // namespace entsoe
diff --git a/extensions/iidm/include/powsybl/iidm/extensions/iidm/ActivePowerControlAdder.hpp b/extensions/iidm/include/powsybl/iidm/extensions/iidm/ActivePowerControlAdder.hpp
index 59446731a..9d298e91c 100644
--- a/extensions/iidm/include/powsybl/iidm/extensions/iidm/ActivePowerControlAdder.hpp
+++ b/extensions/iidm/include/powsybl/iidm/extensions/iidm/ActivePowerControlAdder.hpp
@@ -25,10 +25,6 @@ class ActivePowerControlAdder : public ExtensionAdder {
      */
     explicit ActivePowerControlAdder(Extendable& extendable);
 
-    /**
-     * Destructor
-     */
-    ~ActivePowerControlAdder() noexcept override = default;
 
     /**
      * Copy constructor
@@ -40,6 +36,11 @@ class ActivePowerControlAdder : public ExtensionAdder {
      */
     ActivePowerControlAdder(ActivePowerControlAdder&&) = default;
 
+    /**
+     * Destructor
+     */
+    ~ActivePowerControlAdder() noexcept override = default;
+
     /**
      * Copy assignment operator
      */
diff --git a/extensions/iidm/include/powsybl/iidm/extensions/iidm/CoordinatedReactiveControlAdder.hpp b/extensions/iidm/include/powsybl/iidm/extensions/iidm/CoordinatedReactiveControlAdder.hpp
index a685fe934..a3330be43 100644
--- a/extensions/iidm/include/powsybl/iidm/extensions/iidm/CoordinatedReactiveControlAdder.hpp
+++ b/extensions/iidm/include/powsybl/iidm/extensions/iidm/CoordinatedReactiveControlAdder.hpp
@@ -26,11 +26,6 @@ class CoordinatedReactiveControlAdder : public ExtensionAdder {
      */
     explicit CoordinatedReactiveControlAdder(Extendable& extendable);
 
-    /**
-     * Destructor
-     */
-    ~CoordinatedReactiveControlAdder() noexcept override = default;
-
     /**
      * Copy constructor
      */
@@ -41,6 +36,11 @@ class CoordinatedReactiveControlAdder : public ExtensionAdder {
      */
     CoordinatedReactiveControlAdder(CoordinatedReactiveControlAdder&&) = default;
 
+    /**
+     * Destructor
+     */
+    ~CoordinatedReactiveControlAdder() noexcept override = default;
+
     /**
      * Copy assignment operator
      */
diff --git a/extensions/iidm/include/powsybl/iidm/extensions/iidm/ThreeWindingsTransformerPhaseAngleClockAdder.hpp b/extensions/iidm/include/powsybl/iidm/extensions/iidm/ThreeWindingsTransformerPhaseAngleClockAdder.hpp
index bb8958f16..954d02264 100644
--- a/extensions/iidm/include/powsybl/iidm/extensions/iidm/ThreeWindingsTransformerPhaseAngleClockAdder.hpp
+++ b/extensions/iidm/include/powsybl/iidm/extensions/iidm/ThreeWindingsTransformerPhaseAngleClockAdder.hpp
@@ -26,11 +26,6 @@ class ThreeWindingsTransformerPhaseAngleClockAdder : public ExtensionAdder {
      */
     explicit ThreeWindingsTransformerPhaseAngleClockAdder(Extendable& extendable);
 
-    /**
-     * Destructor
-     */
-    ~ThreeWindingsTransformerPhaseAngleClockAdder() noexcept override = default;
-
     /**
      * Copy constructor
      */
@@ -41,6 +36,11 @@ class ThreeWindingsTransformerPhaseAngleClockAdder : public ExtensionAdder {
      */
     ThreeWindingsTransformerPhaseAngleClockAdder(ThreeWindingsTransformerPhaseAngleClockAdder&&) = default;
 
+    /**
+     * Destructor
+     */
+    ~ThreeWindingsTransformerPhaseAngleClockAdder() noexcept override = default;
+
     /**
      * Copy assignment operator
      */
diff --git a/extensions/iidm/include/powsybl/iidm/extensions/iidm/TwoWindingsTransformerPhaseAngleClockAdder.hpp b/extensions/iidm/include/powsybl/iidm/extensions/iidm/TwoWindingsTransformerPhaseAngleClockAdder.hpp
index 7803f62cc..d5c860c5d 100644
--- a/extensions/iidm/include/powsybl/iidm/extensions/iidm/TwoWindingsTransformerPhaseAngleClockAdder.hpp
+++ b/extensions/iidm/include/powsybl/iidm/extensions/iidm/TwoWindingsTransformerPhaseAngleClockAdder.hpp
@@ -23,11 +23,6 @@ class TwoWindingsTransformerPhaseAngleClockAdder : public ExtensionAdder {
      */
     explicit TwoWindingsTransformerPhaseAngleClockAdder(Extendable& extendable);
 
-    /**
-     * Destructor
-     */
-    ~TwoWindingsTransformerPhaseAngleClockAdder() noexcept override = default;
-
     /**
      * Copy constructor
      */
@@ -38,6 +33,11 @@ class TwoWindingsTransformerPhaseAngleClockAdder : public ExtensionAdder {
      */
     TwoWindingsTransformerPhaseAngleClockAdder(TwoWindingsTransformerPhaseAngleClockAdder&&) = default;
 
+    /**
+     * Destructor
+     */
+    ~TwoWindingsTransformerPhaseAngleClockAdder() noexcept override = default;
+
     /**
      * Copy assignment operator
      */
diff --git a/extensions/iidm/include/powsybl/iidm/extensions/iidm/VoltagePerReactivePowerControlAdder.hpp b/extensions/iidm/include/powsybl/iidm/extensions/iidm/VoltagePerReactivePowerControlAdder.hpp
index dc06ca101..43a0d9094 100644
--- a/extensions/iidm/include/powsybl/iidm/extensions/iidm/VoltagePerReactivePowerControlAdder.hpp
+++ b/extensions/iidm/include/powsybl/iidm/extensions/iidm/VoltagePerReactivePowerControlAdder.hpp
@@ -26,11 +26,6 @@ class VoltagePerReactivePowerControlAdder : public ExtensionAdder {
      */
     explicit VoltagePerReactivePowerControlAdder(Extendable& extendable);
 
-    /**
-     * Destructor
-     */
-    ~VoltagePerReactivePowerControlAdder() noexcept override = default;
-
     /**
      * Copy constructor
      */
@@ -41,6 +36,11 @@ class VoltagePerReactivePowerControlAdder : public ExtensionAdder {
      */
     VoltagePerReactivePowerControlAdder(VoltagePerReactivePowerControlAdder&&) = default;
 
+    /**
+     * Destructor
+     */
+    ~VoltagePerReactivePowerControlAdder() noexcept override = default;
+
     /**
      * Copy assignment operator
      */
diff --git a/extensions/iidm/resources/activePowerControl.xml b/extensions/iidm/resources/activePowerControl.xml
index e4c8047a2..83cbbb59f 100644
--- a/extensions/iidm/resources/activePowerControl.xml
+++ b/extensions/iidm/resources/activePowerControl.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_4" xmlns:apc="http://www.itesla_project.eu/schema/iidm/ext/active_power_control/1_0" id="fictitious" caseDate="2017-06-25T17:43:00+01:00" forecastDistance="0" sourceFormat="test">
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" xmlns:apc="http://www.itesla_project.eu/schema/iidm/ext/active_power_control/1_0" id="fictitious" caseDate="2017-06-25T17:43:00+01:00" forecastDistance="0" sourceFormat="test">
     <iidm:substation id="P1" country="FR" tso="R" geographicalTags="A">
         <iidm:voltageLevel id="VLGEN" nominalV="400" topologyKind="BUS_BREAKER">
             <iidm:busBreakerTopology>
diff --git a/extensions/iidm/resources/coordinatedReactiveControl.xml b/extensions/iidm/resources/coordinatedReactiveControl.xml
index 15c34d50f..3e6ccb49a 100644
--- a/extensions/iidm/resources/coordinatedReactiveControl.xml
+++ b/extensions/iidm/resources/coordinatedReactiveControl.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_4" xmlns:crc="http://www.powsybl.org/schema/iidm/ext/coordinated_reactive_control/1_0" id="sim1" caseDate="2019-05-27T12:17:02.504000+02:00" forecastDistance="0" sourceFormat="test">
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" xmlns:crc="http://www.powsybl.org/schema/iidm/ext/coordinated_reactive_control/1_0" id="sim1" caseDate="2019-05-27T12:17:02.504000+02:00" forecastDistance="0" sourceFormat="test">
     <iidm:substation id="P1" country="FR" tso="RTE" geographicalTags="A">
         <iidm:voltageLevel id="VLGEN" nominalV="24" topologyKind="BUS_BREAKER">
             <iidm:busBreakerTopology>
diff --git a/extensions/iidm/resources/threeWindingsTransformerPhaseAngleClock.xml b/extensions/iidm/resources/threeWindingsTransformerPhaseAngleClock.xml
index db6fd3c49..0fc9c87af 100644
--- a/extensions/iidm/resources/threeWindingsTransformerPhaseAngleClock.xml
+++ b/extensions/iidm/resources/threeWindingsTransformerPhaseAngleClock.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_4" xmlns:threewtpac="http://www.powsybl.org/schema/iidm/ext/three_windings_transformer_phase_angle_clock/1_0" id="three-windings-transformer" caseDate="2018-03-05T13:30:30.486000+01:00" forecastDistance="0" sourceFormat="test">
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" xmlns:threewtpac="http://www.powsybl.org/schema/iidm/ext/three_windings_transformer_phase_angle_clock/1_0" id="three-windings-transformer" caseDate="2018-03-05T13:30:30.486000+01:00" forecastDistance="0" sourceFormat="test">
     <iidm:substation id="SUBSTATION" country="FR">
         <iidm:voltageLevel id="VL_132" nominalV="132" lowVoltageLimit="118.8" highVoltageLimit="145.19999999999999" topologyKind="BUS_BREAKER">
             <iidm:busBreakerTopology>
diff --git a/extensions/iidm/resources/twoWindingsTransformerPhaseAngleClock.xml b/extensions/iidm/resources/twoWindingsTransformerPhaseAngleClock.xml
index 946ad557a..8a8dd3bce 100644
--- a/extensions/iidm/resources/twoWindingsTransformerPhaseAngleClock.xml
+++ b/extensions/iidm/resources/twoWindingsTransformerPhaseAngleClock.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_4" xmlns:twowtpac="http://www.powsybl.org/schema/iidm/ext/two_windings_transformer_phase_angle_clock/1_0" id="sim1" caseDate="2019-05-27T12:17:02.504000+02:00" forecastDistance="0" sourceFormat="test">
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" xmlns:twowtpac="http://www.powsybl.org/schema/iidm/ext/two_windings_transformer_phase_angle_clock/1_0" id="sim1" caseDate="2019-05-27T12:17:02.504000+02:00" forecastDistance="0" sourceFormat="test">
     <iidm:substation id="P1" country="FR" tso="RTE" geographicalTags="A">
         <iidm:voltageLevel id="VLGEN" nominalV="24" topologyKind="BUS_BREAKER">
             <iidm:busBreakerTopology>
diff --git a/extensions/iidm/resources/voltagePerReactivePowerControl.xml b/extensions/iidm/resources/voltagePerReactivePowerControl.xml
index 86548f690..643956ddf 100644
--- a/extensions/iidm/resources/voltagePerReactivePowerControl.xml
+++ b/extensions/iidm/resources/voltagePerReactivePowerControl.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_4" xmlns:vprpc="http://www.powsybl.org/schema/iidm/ext/voltage_per_reactive_power_control/1_0" id="svcTestCase" caseDate="2019-05-27T12:17:02.504000+02:00" forecastDistance="0" sourceFormat="code">
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" xmlns:vprpc="http://www.powsybl.org/schema/iidm/ext/voltage_per_reactive_power_control/1_0" id="svcTestCase" caseDate="2019-05-27T12:17:02.504000+02:00" forecastDistance="0" sourceFormat="code">
     <iidm:substation id="S1" country="FR">
         <iidm:voltageLevel id="VL1" nominalV="380" topologyKind="BUS_BREAKER">
             <iidm:busBreakerTopology>
diff --git a/extensions/iidm/src/ActivePowerControlXmlSerializer.cpp b/extensions/iidm/src/ActivePowerControlXmlSerializer.cpp
index 6a2305f7c..5d03fb562 100644
--- a/extensions/iidm/src/ActivePowerControlXmlSerializer.cpp
+++ b/extensions/iidm/src/ActivePowerControlXmlSerializer.cpp
@@ -45,8 +45,8 @@ Extension& ActivePowerControlXmlSerializer::read(Extendable& extendable, convert
 void ActivePowerControlXmlSerializer::write(const Extension& extension, converter::xml::NetworkXmlWriterContext& context) const {
     const auto& apc = safeCast<ActivePowerControl>(extension);
 
-    context.getExtensionsWriter().writeAttribute("participate", apc.isParticipate());
-    context.getExtensionsWriter().writeAttribute("droop", apc.getDroop());
+    context.getWriter().writeAttribute("participate", apc.isParticipate());
+    context.getWriter().writeAttribute("droop", apc.getDroop());
 }
 
 }  // namespace iidm
diff --git a/extensions/iidm/src/CoordinatedReactiveControlXmlSerializer.cpp b/extensions/iidm/src/CoordinatedReactiveControlXmlSerializer.cpp
index ed902deec..335951d2b 100644
--- a/extensions/iidm/src/CoordinatedReactiveControlXmlSerializer.cpp
+++ b/extensions/iidm/src/CoordinatedReactiveControlXmlSerializer.cpp
@@ -43,7 +43,7 @@ Extension& CoordinatedReactiveControlXmlSerializer::read(Extendable& extendable,
 
 void CoordinatedReactiveControlXmlSerializer::write(const Extension& extension, converter::xml::NetworkXmlWriterContext& context) const {
     const auto& crc = safeCast<CoordinatedReactiveControl>(extension);
-    context.getExtensionsWriter().writeAttribute("qPercent", crc.getQPercent());
+    context.getWriter().writeAttribute("qPercent", crc.getQPercent());
 }
 
 }  // namespace iidm
diff --git a/extensions/iidm/src/ThreeWindingsTransformerPhaseAngleClockXmlSerializer.cpp b/extensions/iidm/src/ThreeWindingsTransformerPhaseAngleClockXmlSerializer.cpp
index 9a248a1bc..807083fdc 100644
--- a/extensions/iidm/src/ThreeWindingsTransformerPhaseAngleClockXmlSerializer.cpp
+++ b/extensions/iidm/src/ThreeWindingsTransformerPhaseAngleClockXmlSerializer.cpp
@@ -45,8 +45,8 @@ Extension& ThreeWindingsTransformerPhaseAngleClockXmlSerializer::read(Extendable
     void ThreeWindingsTransformerPhaseAngleClockXmlSerializer::write(const Extension& extension, converter::xml::NetworkXmlWriterContext& context) const {
         const auto& ext = safeCast<ThreeWindingsTransformerPhaseAngleClock>(extension);
 
-        context.getExtensionsWriter().writeOptionalAttribute("phaseAngleClockLeg2", ext.getPhaseAngleClockLeg2(), 0UL);
-        context.getExtensionsWriter().writeOptionalAttribute("phaseAngleClockLeg3", ext.getPhaseAngleClockLeg3(), 0UL);
+        context.getWriter().writeOptionalAttribute("phaseAngleClockLeg2", ext.getPhaseAngleClockLeg2(), 0UL);
+        context.getWriter().writeOptionalAttribute("phaseAngleClockLeg3", ext.getPhaseAngleClockLeg3(), 0UL);
     }
 
 }  // namespace iidm
diff --git a/extensions/iidm/src/TwoWindingsTransformerPhaseAngleClockXmlSerializer.cpp b/extensions/iidm/src/TwoWindingsTransformerPhaseAngleClockXmlSerializer.cpp
index 37d95c487..f6140c0e3 100644
--- a/extensions/iidm/src/TwoWindingsTransformerPhaseAngleClockXmlSerializer.cpp
+++ b/extensions/iidm/src/TwoWindingsTransformerPhaseAngleClockXmlSerializer.cpp
@@ -42,7 +42,7 @@ Extension& TwoWindingsTransformerPhaseAngleClockXmlSerializer::read(Extendable&
 void TwoWindingsTransformerPhaseAngleClockXmlSerializer::write(const Extension& extension, converter::xml::NetworkXmlWriterContext& context) const {
     const auto& ext = safeCast<TwoWindingsTransformerPhaseAngleClock>(extension);
 
-    context.getExtensionsWriter().writeOptionalAttribute("phaseAngleClock", ext.getPhaseAngleClock(), 0UL);
+    context.getWriter().writeOptionalAttribute("phaseAngleClock", ext.getPhaseAngleClock(), 0UL);
 }
 
 }  // namespace iidm
diff --git a/extensions/iidm/src/VoltagePerReactivePowerControlXmlSerializer.cpp b/extensions/iidm/src/VoltagePerReactivePowerControlXmlSerializer.cpp
index f98efb333..c6094d969 100644
--- a/extensions/iidm/src/VoltagePerReactivePowerControlXmlSerializer.cpp
+++ b/extensions/iidm/src/VoltagePerReactivePowerControlXmlSerializer.cpp
@@ -40,7 +40,7 @@ Extension& VoltagePerReactivePowerControlXmlSerializer::read(Extendable& extenda
 void VoltagePerReactivePowerControlXmlSerializer::write(const Extension& extension, converter::xml::NetworkXmlWriterContext& context) const {
     const auto& ext = safeCast<VoltagePerReactivePowerControl>(extension);
 
-    context.getExtensionsWriter().writeAttribute("slope", ext.getSlope());
+    context.getWriter().writeAttribute("slope", ext.getSlope());
 }
 
 }  // namespace iidm
diff --git a/extensions/sld/include/powsybl/iidm/extensions/sld/BusbarSectionPositionAdder.hpp b/extensions/sld/include/powsybl/iidm/extensions/sld/BusbarSectionPositionAdder.hpp
index 0e2eac6b5..eac440507 100644
--- a/extensions/sld/include/powsybl/iidm/extensions/sld/BusbarSectionPositionAdder.hpp
+++ b/extensions/sld/include/powsybl/iidm/extensions/sld/BusbarSectionPositionAdder.hpp
@@ -26,11 +26,6 @@ class BusbarSectionPositionAdder : public ExtensionAdder {
      */
     explicit BusbarSectionPositionAdder(Extendable& extendable);
 
-    /**
-     * Destructor
-     */
-    ~BusbarSectionPositionAdder() noexcept override = default;
-
     /**
      * Copy constructor
      */
@@ -41,6 +36,11 @@ class BusbarSectionPositionAdder : public ExtensionAdder {
      */
     BusbarSectionPositionAdder(BusbarSectionPositionAdder&&) = default;
 
+    /**
+     * Destructor
+     */
+    ~BusbarSectionPositionAdder() noexcept override = default;
+
     /**
      * Copy assignment operator
      */
diff --git a/extensions/sld/include/powsybl/iidm/extensions/sld/ConnectablePositionAdder.hpp b/extensions/sld/include/powsybl/iidm/extensions/sld/ConnectablePositionAdder.hpp
index 1fecfe97e..0a1427b6a 100644
--- a/extensions/sld/include/powsybl/iidm/extensions/sld/ConnectablePositionAdder.hpp
+++ b/extensions/sld/include/powsybl/iidm/extensions/sld/ConnectablePositionAdder.hpp
@@ -52,11 +52,6 @@ class ConnectablePositionAdder : public ExtensionAdder {
      */
     explicit ConnectablePositionAdder(Extendable& extendable);
 
-    /**
-     * Destructor
-     */
-    ~ConnectablePositionAdder() noexcept override = default;
-
     /**
      * Copy constructor
      */
@@ -67,6 +62,11 @@ class ConnectablePositionAdder : public ExtensionAdder {
      */
     ConnectablePositionAdder(ConnectablePositionAdder&&) = default;
 
+    /**
+     * Destructor
+     */
+    ~ConnectablePositionAdder() noexcept override = default;
+
     /**
      * Copy assignment operator
      */
diff --git a/extensions/sld/resources/busbarSectionPosition.xml b/extensions/sld/resources/busbarSectionPosition.xml
index 07dcfe354..f1cdfadd8 100644
--- a/extensions/sld/resources/busbarSectionPosition.xml
+++ b/extensions/sld/resources/busbarSectionPosition.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_4" xmlns:bbsp="http://www.itesla_project.eu/schema/iidm/ext/busbarsectionposition/1_0" id="test" caseDate="2013-01-15T18:45:00+01:00" forecastDistance="0" sourceFormat="test">
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" xmlns:bbsp="http://www.itesla_project.eu/schema/iidm/ext/busbarsectionposition/1_0" id="test" caseDate="2013-01-15T18:45:00+01:00" forecastDistance="0" sourceFormat="test">
     <iidm:substation id="S" country="FR">
         <iidm:voltageLevel id="VL" nominalV="400" lowVoltageLimit="380" highVoltageLimit="420" topologyKind="NODE_BREAKER">
             <iidm:nodeBreakerTopology>
diff --git a/extensions/sld/resources/connectablePositionFeeder0.xml b/extensions/sld/resources/connectablePositionFeeder0.xml
index f36c1a530..071e2ceb3 100644
--- a/extensions/sld/resources/connectablePositionFeeder0.xml
+++ b/extensions/sld/resources/connectablePositionFeeder0.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_4" xmlns:cp="http://www.itesla_project.eu/schema/iidm/ext/connectable_position/1_0" id="sim1" caseDate="2013-01-15T18:45:00+01:00" forecastDistance="0" sourceFormat="test">
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" xmlns:cp="http://www.itesla_project.eu/schema/iidm/ext/connectable_position/1_0" id="sim1" caseDate="2013-01-15T18:45:00+01:00" forecastDistance="0" sourceFormat="test">
     <iidm:substation id="P1" country="FR" tso="RTE" geographicalTags="A">
         <iidm:voltageLevel id="VLGEN" nominalV="24" topologyKind="BUS_BREAKER">
             <iidm:busBreakerTopology>
diff --git a/extensions/sld/resources/connectablePositionFeeders123.xml b/extensions/sld/resources/connectablePositionFeeders123.xml
index b9b5dd84b..d75d6e3fb 100644
--- a/extensions/sld/resources/connectablePositionFeeders123.xml
+++ b/extensions/sld/resources/connectablePositionFeeders123.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_4" xmlns:cp="http://www.itesla_project.eu/schema/iidm/ext/connectable_position/1_0" id="sim1" caseDate="2013-01-15T18:45:00+01:00" forecastDistance="0" sourceFormat="test">
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" xmlns:cp="http://www.itesla_project.eu/schema/iidm/ext/connectable_position/1_0" id="sim1" caseDate="2013-01-15T18:45:00+01:00" forecastDistance="0" sourceFormat="test">
     <iidm:substation id="P1" country="FR" tso="RTE" geographicalTags="A">
         <iidm:voltageLevel id="VLGEN" nominalV="24" topologyKind="BUS_BREAKER">
             <iidm:busBreakerTopology>
diff --git a/extensions/sld/src/BusbarSectionPositionXmlSerializer.cpp b/extensions/sld/src/BusbarSectionPositionXmlSerializer.cpp
index e6f4c81ba..4239174ae 100644
--- a/extensions/sld/src/BusbarSectionPositionXmlSerializer.cpp
+++ b/extensions/sld/src/BusbarSectionPositionXmlSerializer.cpp
@@ -39,8 +39,8 @@ Extension& BusbarSectionPositionXmlSerializer::read(Extendable& extendable, conv
 
 void BusbarSectionPositionXmlSerializer::write(const Extension& extension, converter::xml::NetworkXmlWriterContext& context) const {
     const auto& busbarSectionPosition = safeCast<BusbarSectionPosition>(extension);
-    context.getExtensionsWriter().writeAttribute("busbarIndex", busbarSectionPosition.getBusbarIndex());
-    context.getExtensionsWriter().writeAttribute("sectionIndex", busbarSectionPosition.getSectionIndex());
+    context.getWriter().writeAttribute("busbarIndex", busbarSectionPosition.getBusbarIndex());
+    context.getWriter().writeAttribute("sectionIndex", busbarSectionPosition.getSectionIndex());
 }
 
 }  // namespace sld
diff --git a/extensions/sld/src/ConnectablePositionXmlSerializer.cpp b/extensions/sld/src/ConnectablePositionXmlSerializer.cpp
index d25a40fdb..f0d361914 100644
--- a/extensions/sld/src/ConnectablePositionXmlSerializer.cpp
+++ b/extensions/sld/src/ConnectablePositionXmlSerializer.cpp
@@ -82,11 +82,11 @@ void ConnectablePositionXmlSerializer::writePosition(const ConnectablePosition::
     if (index) {
         elementName += std::to_string(*index);
     }
-    context.getExtensionsWriter().writeStartElement(getNamespacePrefix(), elementName);
-    context.getExtensionsWriter().writeAttribute("name", feeder.getName());
-    context.getExtensionsWriter().writeAttribute("order", feeder.getOrder());
-    context.getExtensionsWriter().writeAttribute("direction", Enum::toString(feeder.getDirection()));
-    context.getExtensionsWriter().writeEndElement();
+    context.getWriter().writeStartElement(getNamespacePrefix(), elementName);
+    context.getWriter().writeAttribute("name", feeder.getName());
+    context.getWriter().writeAttribute("order", feeder.getOrder());
+    context.getWriter().writeAttribute("direction", Enum::toString(feeder.getDirection()));
+    context.getWriter().writeEndElement();
 }
 
 }  // namespace sld
diff --git a/include/powsybl/iidm/Boundary.hpp b/include/powsybl/iidm/Boundary.hpp
new file mode 100644
index 000000000..e0944b644
--- /dev/null
+++ b/include/powsybl/iidm/Boundary.hpp
@@ -0,0 +1,65 @@
+/**
+ * Copyright (c) 2021, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef POWSYBL_IIDM_BOUNDARY_HPP
+#define POWSYBL_IIDM_BOUNDARY_HPP
+
+#include <powsybl/iidm/Branch.hpp>
+#include <powsybl/stdcxx/optional.hpp>
+#include <powsybl/stdcxx/reference.hpp>
+
+namespace powsybl {
+
+namespace iidm {
+
+class Bus;
+class Connectable;
+class VoltageLevel;
+
+class Boundary {
+public:
+    Boundary() = default;
+
+    Boundary(const Boundary&) = default;
+
+    Boundary(Boundary&&) noexcept = default;
+
+    virtual ~Boundary() noexcept = default;
+
+    Boundary& operator=(const Boundary&) = default;
+
+    Boundary& operator=(Boundary&&) noexcept = default;
+
+    virtual double getAngle() const = 0;
+
+    virtual const Connectable& getConnectable() const = 0;
+
+    virtual Connectable& getConnectable() = 0;
+
+    virtual double getP() const = 0;
+
+    virtual double getQ() const = 0;
+
+    virtual stdcxx::optional<Branch::Side> getSide() const = 0;
+
+    virtual double getV() const = 0;
+
+    virtual const VoltageLevel& getVoltageLevel() const = 0;
+
+    virtual VoltageLevel& getVoltageLevel() = 0;
+
+protected:
+    static double getAngle(const stdcxx::CReference<Bus>& bus);
+
+    static double getV(const stdcxx::CReference<Bus>& bus);
+};
+
+}  // namespace iidm
+
+}  // namespace powsybl
+
+#endif  // POWSYBL_IIDM_BOUNDARY_HPP
diff --git a/include/powsybl/iidm/Country.hpp b/include/powsybl/iidm/Country.hpp
index c7856adec..df2e4c7aa 100644
--- a/include/powsybl/iidm/Country.hpp
+++ b/include/powsybl/iidm/Country.hpp
@@ -134,6 +134,7 @@ enum class Country : unsigned int {
     KI,
     KP,
     KR,
+    XK,
     KW,
     KG,
     LA,
diff --git a/include/powsybl/iidm/DanglingLine.hpp b/include/powsybl/iidm/DanglingLine.hpp
index 7e0a70394..604c66989 100644
--- a/include/powsybl/iidm/DanglingLine.hpp
+++ b/include/powsybl/iidm/DanglingLine.hpp
@@ -8,6 +8,7 @@
 #ifndef POWSYBL_IIDM_DANGLINGLINE_HPP
 #define POWSYBL_IIDM_DANGLINGLINE_HPP
 
+#include <powsybl/iidm/Boundary.hpp>
 #include <powsybl/iidm/CurrentLimitsAdder.hpp>
 #include <powsybl/iidm/DanglingLineGeneration.hpp>
 #include <powsybl/iidm/Injection.hpp>
@@ -30,6 +31,10 @@ class DanglingLine : public Injection {
 
     double getB() const;
 
+    const Boundary& getBoundary() const;
+
+    Boundary& getBoundary();
+
     stdcxx::CReference<CurrentLimits> getCurrentLimits() const;
 
     stdcxx::Reference<CurrentLimits> getCurrentLimits();
@@ -98,6 +103,8 @@ class DanglingLine : public Injection {
     std::unique_ptr<Generation> m_generation;
 
     std::unique_ptr<CurrentLimits> m_limits;
+
+    std::unique_ptr<Boundary> m_boundary;
 };
 
 }  // namespace iidm
diff --git a/include/powsybl/iidm/Extension.hpp b/include/powsybl/iidm/Extension.hpp
index ced3dcde3..a48aaff9e 100644
--- a/include/powsybl/iidm/Extension.hpp
+++ b/include/powsybl/iidm/Extension.hpp
@@ -31,12 +31,12 @@ class Extension {
 
     explicit Extension(Extendable& extendable);
 
-    virtual ~Extension() noexcept = default;
-
     Extension(const Extension&) = delete;
 
     Extension(Extension&&) noexcept = delete;
 
+    virtual ~Extension() noexcept = default;
+
     Extension& operator=(const Extension&) = delete;
 
     Extension& operator=(Extension&&) noexcept = delete;
diff --git a/include/powsybl/iidm/ExtensionAdder.hpp b/include/powsybl/iidm/ExtensionAdder.hpp
index 7f9e88bb6..f8eb80914 100644
--- a/include/powsybl/iidm/ExtensionAdder.hpp
+++ b/include/powsybl/iidm/ExtensionAdder.hpp
@@ -42,10 +42,6 @@ class ExtensionAdder {
      */
     explicit ExtensionAdder(Extendable& extendable);
 
-    /**
-     * Destructor
-     */
-    virtual ~ExtensionAdder() noexcept = default;
 
     /**
      * Copy constructor
@@ -57,6 +53,11 @@ class ExtensionAdder {
      */
     ExtensionAdder(ExtensionAdder&&) noexcept = default;
 
+    /**
+     * Destructor
+     */
+    virtual ~ExtensionAdder() noexcept = default;
+
 private:
     /**
      * Creates the extension.
diff --git a/include/powsybl/iidm/HalfLine.hpp b/include/powsybl/iidm/HalfLine.hpp
index ebd2361c0..10b3f3f9b 100644
--- a/include/powsybl/iidm/HalfLine.hpp
+++ b/include/powsybl/iidm/HalfLine.hpp
@@ -10,6 +10,7 @@
 
 #include <string>
 
+#include <powsybl/iidm/Boundary.hpp>
 #include <powsybl/iidm/LineCharacteristics.hpp>
 #include <powsybl/iidm/Validable.hpp>
 #include <powsybl/stdcxx/math.hpp>
@@ -22,6 +23,12 @@ namespace iidm {
 class TieLine;
 class TieLineAdder;
 
+namespace half_line {
+
+class Boundary;
+
+}  // namespace half_line
+
 namespace tie_line {
 
 class HalfLineAdder;
@@ -35,6 +42,10 @@ class HalfLine : public Validable {
 
     double getB2() const;
 
+    const Boundary& getBoundary() const;
+
+    Boundary& getBoundary();
+
     double getG1() const;
 
     double getG2() const;
@@ -47,10 +58,6 @@ class HalfLine : public Validable {
 
     double getX() const;
 
-    double getXnodeP() const;
-
-    double getXnodeQ() const;
-
     bool isFictitious() const;
 
     HalfLine& setB1(double b1);
@@ -67,24 +74,26 @@ class HalfLine : public Validable {
 
     HalfLine& setX(double x);
 
-    HalfLine& setXnodeP(double xnodeP);
-
-    HalfLine& setXnodeQ(double xnodeQ);
-
 private:
-    HalfLine(const std::string& id, const std::string& name, bool fictitious, double xnodeP, double xnodeQ,
-             double r, double x, double g1, double b1, double g2, double b2);
+    HalfLine(const std::string& id, const std::string& name, bool fictitious,
+             double r, double x, double g1, double b1, double g2, double b2, const Branch::Side& side);
 
     HalfLine(HalfLine&& halfLine) noexcept;
 
     ~HalfLine() override = default;
 
+    const TieLine& getParent() const;
+
+    TieLine& getParent();
+
     void setParent(TieLine& parent);
 
     friend class iidm::TieLine;
 
     friend class iidm::TieLineAdder;
 
+    friend class half_line::Boundary;
+
     friend class HalfLineAdder;
 
 private:
@@ -96,11 +105,9 @@ class HalfLine : public Validable {
 
     LineCharacteristics m_lineCharacteristics;
 
-    double m_xnodeP = stdcxx::nan();
-
-    double m_xnodeQ = stdcxx::nan();
-
     bool m_fictitious = false;
+
+    std::unique_ptr<Boundary> m_boundary;
 };
 
 }  // namespace tie_line
diff --git a/include/powsybl/iidm/HalfLineAdder.hpp b/include/powsybl/iidm/HalfLineAdder.hpp
index ebf77a994..fb182e234 100644
--- a/include/powsybl/iidm/HalfLineAdder.hpp
+++ b/include/powsybl/iidm/HalfLineAdder.hpp
@@ -50,10 +50,6 @@ class HalfLineAdder : public Validable {
 
     HalfLineAdder& setX(double x);
 
-    HalfLineAdder& setXnodeP(double xnodeP);
-
-    HalfLineAdder& setXnodeQ(double xnodeQ);
-
 private:
     HalfLine build() const;
 
@@ -70,10 +66,6 @@ class HalfLineAdder : public Validable {
 
     bool m_fictitious = false;
 
-    double m_xnodeP = stdcxx::nan();
-
-    double m_xnodeQ = stdcxx::nan();
-
     double m_r = stdcxx::nan();
 
     double m_x = stdcxx::nan();
diff --git a/include/powsybl/iidm/ThreeWindingsTransformerLeg.hpp b/include/powsybl/iidm/ThreeWindingsTransformerLeg.hpp
index 08b706ef9..86f82ac1c 100644
--- a/include/powsybl/iidm/ThreeWindingsTransformerLeg.hpp
+++ b/include/powsybl/iidm/ThreeWindingsTransformerLeg.hpp
@@ -56,12 +56,12 @@ class Leg : public virtual RatioTapChangerHolder, public virtual PhaseTapChanger
 
     Leg(Leg&&) noexcept = default;
 
+    ~Leg() noexcept override = default;
+
     Leg& operator=(const Leg&) = delete;
 
     Leg& operator=(Leg&&) noexcept = default;
 
-    ~Leg() noexcept override = default;
-
     double getB() const;
 
     stdcxx::CReference<CurrentLimits> getCurrentLimits() const;
diff --git a/include/powsybl/iidm/ValidationUtils.hpp b/include/powsybl/iidm/ValidationUtils.hpp
index 66fafed71..e8be1bb9d 100644
--- a/include/powsybl/iidm/ValidationUtils.hpp
+++ b/include/powsybl/iidm/ValidationUtils.hpp
@@ -54,8 +54,6 @@ double checkG1(const Validable& validable, double g1);
 
 double checkG2(const Validable& validable, double g2);
 
-void checkHalf(const Validable& validable, const TieLine::HalfLine& half, int num);
-
 double checkHvdcActivePowerSetpoint(const Validable& validable, double activePowerSetpoint);
 
 double checkHvdcMaxP(const Validable& validable, double maxP);
diff --git a/include/powsybl/iidm/converter/FakeAnonymizer.hpp b/include/powsybl/iidm/converter/FakeAnonymizer.hpp
index a3e6890d1..79628cfe6 100644
--- a/include/powsybl/iidm/converter/FakeAnonymizer.hpp
+++ b/include/powsybl/iidm/converter/FakeAnonymizer.hpp
@@ -33,12 +33,12 @@ class FakeAnonymizer : public Anonymizer {
 public:
     FakeAnonymizer() = default;
 
-    ~FakeAnonymizer() override = default;
-
     FakeAnonymizer(const FakeAnonymizer&) = default;
 
     FakeAnonymizer(FakeAnonymizer&&) noexcept = default;
 
+    ~FakeAnonymizer() override = default;
+
     FakeAnonymizer& operator=(const FakeAnonymizer&) = default;
 
     FakeAnonymizer& operator=(FakeAnonymizer&&) noexcept = default;
diff --git a/include/powsybl/iidm/converter/SimpleAnonymizer.hpp b/include/powsybl/iidm/converter/SimpleAnonymizer.hpp
index a2ff54c84..b44454b72 100644
--- a/include/powsybl/iidm/converter/SimpleAnonymizer.hpp
+++ b/include/powsybl/iidm/converter/SimpleAnonymizer.hpp
@@ -38,12 +38,12 @@ class SimpleAnonymizer : public Anonymizer {
 public:
     SimpleAnonymizer() = default;
 
-    ~SimpleAnonymizer() override = default;
-
     SimpleAnonymizer(const SimpleAnonymizer&) = default;
 
     SimpleAnonymizer(SimpleAnonymizer&&) = default;
 
+    ~SimpleAnonymizer() override = default;
+
     SimpleAnonymizer& operator=(const SimpleAnonymizer&) = default;
 
     SimpleAnonymizer& operator=(SimpleAnonymizer&&) = default;
diff --git a/include/powsybl/iidm/converter/xml/IidmXmlVersion.hpp b/include/powsybl/iidm/converter/xml/IidmXmlVersion.hpp
index 9e7205cd8..202cad970 100644
--- a/include/powsybl/iidm/converter/xml/IidmXmlVersion.hpp
+++ b/include/powsybl/iidm/converter/xml/IidmXmlVersion.hpp
@@ -52,6 +52,11 @@ class IidmXmlVersion {
      */
     static const IidmXmlVersion& V1_4();
 
+    /**
+     * IIDM V1.5 (http://www.powsybl.org)
+     */
+    static const IidmXmlVersion& V1_5();
+
 public:
     /**
      * Return the list of all supported XIIDM versions
diff --git a/include/powsybl/iidm/converter/xml/NetworkXmlWriterContext.hpp b/include/powsybl/iidm/converter/xml/NetworkXmlWriterContext.hpp
index 2dfde347a..116efd38c 100644
--- a/include/powsybl/iidm/converter/xml/NetworkXmlWriterContext.hpp
+++ b/include/powsybl/iidm/converter/xml/NetworkXmlWriterContext.hpp
@@ -51,8 +51,6 @@ class NetworkXmlWriterContext {
 
     const std::string& getExtensionVersion(const std::string& extensionName) const;
 
-    powsybl::xml::XmlStreamWriter& getExtensionsWriter();
-
     const BusFilter& getFilter() const;
 
     const ExportOptions& getOptions() const;
@@ -63,13 +61,9 @@ class NetworkXmlWriterContext {
 
     bool isExportedEquipment(const std::string& id);
 
-    void setExtensionsWriter(powsybl::xml::XmlStreamWriter& extensionsWriter);
-
 private:
     powsybl::xml::XmlStreamWriter& m_writer;
 
-    std::reference_wrapper<powsybl::xml::XmlStreamWriter> m_extensionsWriter;
-
     std::unique_ptr<Anonymizer> m_anonymizer;
 
     ExportOptions m_options;
diff --git a/include/powsybl/iidm/extensions/LoadDetailAdder.hpp b/include/powsybl/iidm/extensions/LoadDetailAdder.hpp
index 6728ccd81..d1f6e2969 100644
--- a/include/powsybl/iidm/extensions/LoadDetailAdder.hpp
+++ b/include/powsybl/iidm/extensions/LoadDetailAdder.hpp
@@ -23,11 +23,6 @@ class LoadDetailAdder : public ExtensionAdder {
      */
     explicit LoadDetailAdder(Extendable& extendable);
 
-    /**
-     * Destructor
-     */
-    ~LoadDetailAdder() noexcept override = default;
-
     /**
      * Copy constructor
      */
@@ -38,6 +33,11 @@ class LoadDetailAdder : public ExtensionAdder {
      */
     LoadDetailAdder(LoadDetailAdder&&) = default;
 
+    /**
+     * Destructor
+     */
+    ~LoadDetailAdder() noexcept override = default;
+
     /**
      * Copy assignment operator
      */
diff --git a/include/powsybl/iidm/extensions/SlackTerminalAdder.hpp b/include/powsybl/iidm/extensions/SlackTerminalAdder.hpp
index 798dc7bbc..cd2438fca 100644
--- a/include/powsybl/iidm/extensions/SlackTerminalAdder.hpp
+++ b/include/powsybl/iidm/extensions/SlackTerminalAdder.hpp
@@ -26,11 +26,6 @@ class SlackTerminalAdder : public ExtensionAdder {
      */
     explicit SlackTerminalAdder(Extendable& extendable);
 
-    /**
-     * Destructor
-     */
-    ~SlackTerminalAdder() noexcept override = default;
-
     /**
      * Copy constructor
      */
@@ -41,6 +36,11 @@ class SlackTerminalAdder : public ExtensionAdder {
      */
     SlackTerminalAdder(SlackTerminalAdder&&) = default;
 
+    /**
+     * Destructor
+     */
+    ~SlackTerminalAdder() noexcept override = default;
+
     /**
      * Copy assignment operator
      */
diff --git a/include/powsybl/iidm/util/SV.hpp b/include/powsybl/iidm/util/SV.hpp
new file mode 100644
index 000000000..dec4b9359
--- /dev/null
+++ b/include/powsybl/iidm/util/SV.hpp
@@ -0,0 +1,117 @@
+/**
+ * Copyright (c) 2021, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef POWSYBL_IIDM_SV_HPP
+#define POWSYBL_IIDM_SV_HPP
+
+#include <complex>
+
+namespace powsybl {
+
+namespace iidm {
+
+class DanglingLine;
+class Line;
+class TwoWindingsTransformer;
+
+namespace tie_line {
+
+class HalfLine;
+
+}  // namespace tie_line
+
+class SV {
+public:
+    static double getB(const TwoWindingsTransformer& twt);
+
+    static double getG(const TwoWindingsTransformer& twt);
+
+    static double getR(const TwoWindingsTransformer& twt);
+
+    static double getRho(const TwoWindingsTransformer& twt);
+
+    static double getX(const TwoWindingsTransformer& twt);
+
+public:
+    SV(double p, double q, double u, double a);
+
+    double getA() const;
+
+    double getP() const;
+
+    double getQ() const;
+
+    double getU() const;
+
+    SV otherSide(double r, double x, double g, double b, double rho) const;
+
+    SV otherSide(double r, double x, double g1, double b1, double g2, double b2, double rho) const;
+
+    SV otherSide(const TwoWindingsTransformer& twt) const;
+
+    SV otherSide(const Line& line) const;
+
+    SV otherSide(const DanglingLine& danglingLine) const;
+
+    double otherSideA(double r, double x, double g1, double b1, double rho) const;
+
+    double otherSideA(const tie_line::HalfLine& halfLine) const;
+
+    double otherSideA(const DanglingLine& danglingLine) const;
+
+    double otherSideP(double r, double x, double g1, double b1, double g2, double b2, double rho) const;
+
+    double otherSideP(const DanglingLine& danglingLine) const;
+
+    double otherSideP(const tie_line::HalfLine& halfLine) const;
+
+    double otherSideQ(double r, double x, double g1, double b1, double g2, double b2, double rho) const;
+
+    double otherSideQ(const tie_line::HalfLine& halfLine) const;
+
+    double otherSideQ(const DanglingLine& danglingLine) const;
+
+    double otherSideU(double r, double x, double g1, double b1, double rho) const;
+
+    double otherSideU(const tie_line::HalfLine& halfLine) const;
+
+    double otherSideU(const DanglingLine& danglingLine) const;
+
+    SV otherSideY1Y2(const Line& line) const;
+
+private:
+    std::complex<double> computeS2(const std::complex<double>& y1, const std::complex<double>& y2, const std::complex<double>& z, double rho) const;
+
+    std::complex<double> computeS2(const std::complex<double>& y, const std::complex<double>& z, double rho) const;
+
+    std::complex<double> computeU2(const std::complex<double>& y1, const std::complex<double>& y2, const std::complex<double>& z, double rho) const;
+
+    std::complex<double> computeU2(const std::complex<double>& y, const std::complex<double>& z, double rho) const;
+
+private:
+    double m_p;
+
+    double m_q;
+
+    double m_u;
+
+    double m_a;
+
+    std::complex<double> m_s1;
+
+    std::complex<double> m_u1;
+
+    std::complex<double> m_v1;
+
+    std::complex<double> m_i1;
+};
+
+}  // namespace iidm
+
+}  // namespace powsybl
+
+#endif  // POWSYBL_IIDM_SV_HPP
diff --git a/include/powsybl/stdcxx/math.hpp b/include/powsybl/stdcxx/math.hpp
index 2ac1cbe0a..032a90b2e 100644
--- a/include/powsybl/stdcxx/math.hpp
+++ b/include/powsybl/stdcxx/math.hpp
@@ -12,8 +12,33 @@
 #include <limits>
 #include <sstream>
 
+#if __cplusplus >= 201703L
+
+#include <numbers>
+
+namespace stdcxx {
+
+constexpr double PI = std::numbers::pi;
+
+}  // namespace stdcxx
+
+#else
+
+#include <boost/math/constants/constants.hpp>
+
+namespace stdcxx {
+
+constexpr double PI = boost::math::constants::pi<double>();
+
+}  // namespace stdcxx
+
+#endif
+
 namespace stdcxx {
 
+constexpr double toDegrees = 180.0 / PI;
+constexpr double toRadians = PI / 180.0;
+
 template <typename T = double>
 inline bool isEqual(const T& v1, const T& v2) {
     if (std::isnan(v1) ^ std::isnan(v2)) {
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9cd4a7663..4c95efde2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,6 +14,7 @@ set(IIDM_SOURCES
     iidm/AbstractTerminalTopologyVisitor.cpp
     iidm/Battery.cpp
     iidm/BatteryAdder.cpp
+    iidm/Boundary.cpp
     iidm/Branch.cpp
     iidm/Bus.cpp
     iidm/BusAdder.cpp
@@ -38,6 +39,7 @@ set(IIDM_SOURCES
     iidm/CurrentLimits.cpp
     iidm/DanglingLine.cpp
     iidm/DanglingLineAdder.cpp
+    iidm/DanglingLineBoundary.cpp
     iidm/DanglingLineGeneration.cpp
     iidm/DanglingLineGenerationAdder.cpp
     iidm/EnergySource.cpp
@@ -50,6 +52,7 @@ set(IIDM_SOURCES
     iidm/GeneratorAdder.cpp
     iidm/HalfLine.cpp
     iidm/HalfLineAdder.cpp
+    iidm/HalfLineBoundary.cpp
     iidm/HvdcConverterStation.cpp
     iidm/HvdcLine.cpp
     iidm/HvdcLineAdder.cpp
@@ -188,6 +191,7 @@ set(IIDM_SOURCES
     iidm/util/LimitViolationUtils.cpp
     iidm/util/Networks.cpp
     iidm/util/Substations.cpp
+    iidm/util/SV.cpp
     iidm/util/TerminalFinder.cpp
     iidm/util/VoltageLevels.cpp
 
diff --git a/src/iidm/AbstractMultiVariantConnectableExtension.cpp b/src/iidm/AbstractMultiVariantConnectableExtension.cpp
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/iidm/Boundary.cpp b/src/iidm/Boundary.cpp
new file mode 100644
index 000000000..8e366e1a2
--- /dev/null
+++ b/src/iidm/Boundary.cpp
@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) 2021, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <powsybl/iidm/Boundary.hpp>
+
+#include <powsybl/iidm/Bus.hpp>
+#include <powsybl/stdcxx/math.hpp>
+
+namespace powsybl {
+
+namespace iidm {
+
+double Boundary::getAngle(const stdcxx::CReference<Bus>& bus) {
+    return bus ? bus.get().getAngle() : stdcxx::nan();
+}
+
+double Boundary::getV(const stdcxx::CReference<Bus>& bus) {
+    return bus ? bus.get().getV() : stdcxx::nan();
+}
+
+}  // namespace iidm
+
+}  // namespace powsybl
diff --git a/src/iidm/Country.cpp b/src/iidm/Country.cpp
index 747e4ad99..95a732c9a 100644
--- a/src/iidm/Country.cpp
+++ b/src/iidm/Country.cpp
@@ -18,7 +18,7 @@ namespace powsybl {
 namespace iidm {
 
 std::string getCountryName(const Country& country) {
-    static std::array<std::string, 249> s_countryNames {{
+    static std::array<std::string, 250> s_countryNames {{
         u8"AFGHANISTAN",
         u8"ÅLAND ISLANDS",
         u8"ALBANIA",
@@ -138,6 +138,7 @@ std::string getCountryName(const Country& country) {
         u8"KIRIBATI",
         u8"KOREA, DEMOCRATIC PEOPLE'S REPUBLIC OF",
         u8"KOREA, REPUBLIC OF",
+        u8"KOSOVO",
         u8"KUWAIT",
         u8"KYRGYZSTAN",
         u8"LAO PEOPLE'S DEMOCRATIC REPUBLIC",
@@ -401,6 +402,7 @@ const std::initializer_list<std::string>& getNames<Country>() {
         u8"KI",
         u8"KP",
         u8"KR",
+        u8"XK",
         u8"KW",
         u8"KG",
         u8"LA",
diff --git a/src/iidm/DanglingLine.cpp b/src/iidm/DanglingLine.cpp
index 75b56c3bb..a39c9601d 100644
--- a/src/iidm/DanglingLine.cpp
+++ b/src/iidm/DanglingLine.cpp
@@ -10,6 +10,8 @@
 #include <powsybl/iidm/ValidationUtils.hpp>
 #include <powsybl/iidm/VariantManager.hpp>
 
+#include "DanglingLineBoundary.hpp"
+
 namespace powsybl {
 
 namespace iidm {
@@ -25,7 +27,8 @@ DanglingLine::DanglingLine(VariantManagerHolder& network, const std::string& id,
     m_p0(network.getVariantManager().getVariantArraySize(), checkP0(*this, p0)),
     m_q0(network.getVariantManager().getVariantArraySize(), checkQ0(*this, q0)),
     m_ucteXnodeCode(ucteXnodeCode),
-    m_generation(std::move(generation)) {
+    m_generation(std::move(generation)),
+    m_boundary(stdcxx::make_unique<dangling_line::Boundary>(*this)) {
 
     if (m_generation) {
         m_generation->attach(*this);
@@ -60,6 +63,14 @@ double DanglingLine::getB() const {
     return m_b;
 }
 
+const Boundary& DanglingLine::getBoundary() const {
+    return *m_boundary;
+}
+
+Boundary& DanglingLine::getBoundary() {
+    return *m_boundary;
+}
+
 stdcxx::CReference<CurrentLimits> DanglingLine::getCurrentLimits() const {
     return stdcxx::cref(m_limits);
 }
diff --git a/src/iidm/DanglingLineBoundary.cpp b/src/iidm/DanglingLineBoundary.cpp
new file mode 100644
index 000000000..615993973
--- /dev/null
+++ b/src/iidm/DanglingLineBoundary.cpp
@@ -0,0 +1,74 @@
+/**
+ * Copyright (c) 2021, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "DanglingLineBoundary.hpp"
+
+#include <powsybl/iidm/Bus.hpp>
+#include <powsybl/iidm/DanglingLine.hpp>
+#include <powsybl/iidm/Terminal.hpp>
+#include <powsybl/iidm/util/SV.hpp>
+#include <powsybl/stdcxx/math.hpp>
+
+namespace powsybl {
+
+namespace iidm {
+
+namespace dangling_line {
+
+Boundary::Boundary(DanglingLine& parent) :
+    m_parent(parent) {
+}
+
+double Boundary::getAngle() const {
+    const Terminal& t = m_parent.getTerminal();
+    const stdcxx::CReference<Bus>& b = t.getBusView().getBus();
+    return SV(t.getP(), t.getQ(), iidm::Boundary::getV(b), iidm::Boundary::getAngle(b)).otherSideA(m_parent);
+}
+
+const Connectable& Boundary::getConnectable() const {
+    return m_parent;
+}
+
+Connectable& Boundary::getConnectable() {
+    return m_parent;
+}
+
+double Boundary::getP() const {
+    const Terminal& t = m_parent.getTerminal();
+    const auto& b = t.getBusView().getBus();
+    return SV(t.getP(), t.getQ(), iidm::Boundary::getV(b), iidm::Boundary::getAngle(b)).otherSideP(m_parent);
+}
+
+double Boundary::getQ() const {
+    const Terminal& t = m_parent.getTerminal();
+    const auto& b = t.getBusView().getBus();
+    return SV(t.getP(), t.getQ(), iidm::Boundary::getV(b), iidm::Boundary::getAngle(b)).otherSideQ(m_parent);
+}
+
+stdcxx::optional<Branch::Side> Boundary::getSide() const {
+    return {};
+}
+
+double Boundary::getV() const {
+    const Terminal& t = m_parent.getTerminal();
+    const auto& b = t.getBusView().getBus();
+    return SV(t.getP(), t.getQ(), iidm::Boundary::getV(b), iidm::Boundary::getAngle(b)).otherSideU(m_parent);
+}
+
+const VoltageLevel& Boundary::getVoltageLevel() const {
+    return m_parent.getTerminal().getVoltageLevel();
+}
+
+VoltageLevel& Boundary::getVoltageLevel() {
+    return m_parent.getTerminal().getVoltageLevel();
+}
+
+}  // namespace dangling_line
+
+}  // namespace iidm
+
+}  // namespace powsybl
diff --git a/src/iidm/DanglingLineBoundary.hpp b/src/iidm/DanglingLineBoundary.hpp
new file mode 100644
index 000000000..7477f128f
--- /dev/null
+++ b/src/iidm/DanglingLineBoundary.hpp
@@ -0,0 +1,67 @@
+/**
+ * Copyright (c) 2021, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef POWSYBL_IIDM_DANGLINGLINEBOUNDARY_HPP
+#define POWSYBL_IIDM_DANGLINGLINEBOUNDARY_HPP
+
+#include <powsybl/iidm/Boundary.hpp>
+#include <powsybl/iidm/HalfLine.hpp>
+#include <powsybl/stdcxx/reference.hpp>
+
+namespace powsybl {
+
+namespace iidm {
+
+class Bus;
+class DanglingLine;
+
+namespace dangling_line {
+
+class Boundary : public iidm::Boundary {
+public:  // iidm::Boundary
+    double getAngle() const override;
+
+    const Connectable& getConnectable() const override;
+
+    Connectable& getConnectable() override;
+
+    double getP() const override;
+
+    double getQ() const override;
+
+    stdcxx::optional<Branch::Side> getSide() const override;
+
+    double getV() const override;
+
+    const VoltageLevel& getVoltageLevel() const override;
+
+    VoltageLevel& getVoltageLevel() override;
+
+public:
+    explicit Boundary(DanglingLine& parent);
+
+    Boundary(const Boundary&) = delete;
+
+    Boundary(Boundary&&) noexcept = delete;
+
+    ~Boundary() noexcept override = default;
+
+    Boundary& operator=(const Boundary&) = delete;
+
+    Boundary& operator=(Boundary&&) noexcept = delete;
+
+private:
+    DanglingLine& m_parent;
+};
+
+}  // namespace dangling_line
+
+}  // namespace iidm
+
+}  // namespace powsybl
+
+#endif  // POWSYBL_IIDM_DANGLINGLINEBOUNDARY_HPP
diff --git a/src/iidm/ExtensionProviders.cpp b/src/iidm/ExtensionProviders.cpp
index cf0d07c3c..8767b7f2d 100644
--- a/src/iidm/ExtensionProviders.cpp
+++ b/src/iidm/ExtensionProviders.cpp
@@ -45,7 +45,7 @@ template <typename T, typename Dummy>
 const T& ExtensionProviders<T, Dummy>::findProviderOrThrowException(const std::string& name) const {
     const auto& it = m_providers.find(name);
     if (it == m_providers.end()) {
-        throw PowsyblException(stdcxx::format("No provider found for extension '%1'", name));
+        throw PowsyblException(stdcxx::format("No provider found for extension '%1%'", name));
     }
     return *it->second;
 }
diff --git a/src/iidm/HalfLine.cpp b/src/iidm/HalfLine.cpp
index 79eda9443..679515ffe 100644
--- a/src/iidm/HalfLine.cpp
+++ b/src/iidm/HalfLine.cpp
@@ -10,20 +10,21 @@
 #include <powsybl/iidm/TieLine.hpp>
 #include <powsybl/stdcxx/format.hpp>
 
+#include "HalfLineBoundary.hpp"
+
 namespace powsybl {
 
 namespace iidm {
 
 namespace tie_line {
 
-HalfLine::HalfLine(const std::string& id, const std::string& name, bool fictitious, double xnodeP, double xnodeQ,
-                   double r, double x, double g1, double b1, double g2, double b2) :
+HalfLine::HalfLine(const std::string& id, const std::string& name, bool fictitious,
+                   double r, double x, double g1, double b1, double g2, double b2, const Branch::Side& side) :
     m_id(id),
     m_name(name),
     m_lineCharacteristics(*this, r, x, g1, b1, g2, b2),
-    m_xnodeP(xnodeP),
-    m_xnodeQ(xnodeQ),
-    m_fictitious(fictitious) {
+    m_fictitious(fictitious),
+    m_boundary(stdcxx::make_unique<half_line::Boundary>(*this, side)) {
 }
 
 HalfLine::HalfLine(HalfLine&& halfLine) noexcept :
@@ -31,9 +32,8 @@ HalfLine::HalfLine(HalfLine&& halfLine) noexcept :
     m_id(std::move(halfLine.m_id)),
     m_name(std::move(halfLine.m_name)),
     m_lineCharacteristics(*this, halfLine.getR(), halfLine.getX(), halfLine.getG1(), halfLine.getB1(), halfLine.getG2(), halfLine.getB2()),
-    m_xnodeP(halfLine.m_xnodeP),
-    m_xnodeQ(halfLine.m_xnodeQ),
-    m_fictitious(halfLine.m_fictitious) {
+    m_fictitious(halfLine.m_fictitious),
+    m_boundary(stdcxx::make_unique<half_line::Boundary>(*this, *halfLine.getBoundary().getSide())) {
 }
 
 double HalfLine::getB1() const {
@@ -44,6 +44,14 @@ double HalfLine::getB2() const {
     return m_lineCharacteristics.getB2();
 }
 
+const Boundary& HalfLine::getBoundary() const {
+    return *m_boundary;
+}
+
+Boundary& HalfLine::getBoundary() {
+    return *m_boundary;
+}
+
 double HalfLine::getG1() const {
     return m_lineCharacteristics.getG1();
 }
@@ -64,20 +72,20 @@ const std::string& HalfLine::getName() const {
     return m_name.empty() ? m_id : m_name;
 }
 
-double HalfLine::getR() const {
-    return m_lineCharacteristics.getR();
+const TieLine& HalfLine::getParent() const {
+    return m_parent;
 }
 
-double HalfLine::getX() const {
-    return m_lineCharacteristics.getX();
+TieLine& HalfLine::getParent() {
+    return m_parent;
 }
 
-double HalfLine::getXnodeP() const {
-    return m_xnodeP;
+double HalfLine::getR() const {
+    return m_lineCharacteristics.getR();
 }
 
-double HalfLine::getXnodeQ() const {
-    return m_xnodeQ;
+double HalfLine::getX() const {
+    return m_lineCharacteristics.getX();
 }
 
 bool HalfLine::isFictitious() const {
@@ -126,17 +134,6 @@ HalfLine& HalfLine::setX(double x) {
     return *this;
 }
 
-HalfLine& HalfLine::setXnodeP(double xnodeP) {
-    m_xnodeP = xnodeP;
-    return *this;
-}
-
-HalfLine& HalfLine::setXnodeQ(double xnodeQ) {
-    m_xnodeQ = xnodeQ;
-    return *this;
-}
-
-
 }  // namespace tie_line
 
 }  // namespace iidm
diff --git a/src/iidm/HalfLineAdder.cpp b/src/iidm/HalfLineAdder.cpp
index c1acac202..2ecaf3b3f 100644
--- a/src/iidm/HalfLineAdder.cpp
+++ b/src/iidm/HalfLineAdder.cpp
@@ -44,12 +44,6 @@ TieLineAdder& HalfLineAdder::add() {
     if (std::isnan(m_b2)) {
         throw ValidationException(m_parent, stdcxx::format("b2 is not set for half line %1%", m_num));
     }
-    if (std::isnan(m_xnodeP)) {
-        throw ValidationException(m_parent, stdcxx::format("xnodeP is not set for half line %1%", m_num));
-    }
-    if (std::isnan(m_xnodeQ)) {
-        throw ValidationException(m_parent, stdcxx::format("xnodeQ is not set for half line %1%", m_num));
-    }
     switch (m_num) {
     case 1:
         m_parent.setHalfLineAdder1(*this);
@@ -66,7 +60,8 @@ TieLineAdder& HalfLineAdder::add() {
 }
 
 HalfLine HalfLineAdder::build() const {
-    return HalfLine(m_id, m_name, m_fictitious, m_xnodeP, m_xnodeQ, m_r, m_x, m_g1, m_b1, m_g2, m_b2);
+    Branch::Side side = (m_num == 1) ? Branch::Side::ONE : Branch::Side::TWO;
+    return HalfLine(m_id, m_name, m_fictitious, m_r, m_x, m_g1, m_b1, m_g2, m_b2, side);
 }
 
 std::string HalfLineAdder::getMessageHeader() const {
@@ -118,16 +113,6 @@ HalfLineAdder& HalfLineAdder::setX(double x) {
     return *this;
 }
 
-HalfLineAdder& HalfLineAdder::setXnodeP(double xnodeP) {
-    m_xnodeP = xnodeP;
-    return *this;
-}
-
-HalfLineAdder& HalfLineAdder::setXnodeQ(double xnodeQ) {
-    m_xnodeQ = xnodeQ;
-    return *this;
-}
-
 }  // namespace tie_line
 
 }  // namespace iidm
diff --git a/src/iidm/HalfLineBoundary.cpp b/src/iidm/HalfLineBoundary.cpp
new file mode 100644
index 000000000..1ed02cce8
--- /dev/null
+++ b/src/iidm/HalfLineBoundary.cpp
@@ -0,0 +1,83 @@
+/**
+ * Copyright (c) 2021, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "HalfLineBoundary.hpp"
+
+#include <powsybl/iidm/Bus.hpp>
+#include <powsybl/iidm/HalfLine.hpp>
+#include <powsybl/iidm/Terminal.hpp>
+#include <powsybl/iidm/TieLine.hpp>
+#include <powsybl/iidm/util/SV.hpp>
+
+namespace powsybl {
+
+namespace iidm {
+
+namespace half_line {
+
+Boundary::Boundary(tie_line::HalfLine& halfline, const Branch::Side& side) :
+    m_parent(halfline),
+    m_side(side) {
+}
+
+double Boundary::getAngle() const {
+    const Terminal& t = getTieLine().getTerminal(m_side);
+    const auto& b = t.getBusView().getBus();
+    return SV(t.getP(), t.getQ(), iidm::Boundary::getV(b), iidm::Boundary::getAngle(b)).otherSideA(m_parent);
+}
+
+const Connectable& Boundary::getConnectable() const {
+    return m_parent.getParent();
+}
+
+Connectable& Boundary::getConnectable() {
+    return m_parent.getParent();
+}
+
+double Boundary::getP() const {
+    const Terminal& t = getTieLine().getTerminal(m_side);
+    const auto& b = t.getBusView().getBus();
+    return SV(t.getP(), t.getQ(), iidm::Boundary::getV(b), iidm::Boundary::getAngle(b)).otherSideP(m_parent);
+}
+
+double Boundary::getQ() const {
+    const Terminal& t = getTieLine().getTerminal(m_side);
+    const auto& b = t.getBusView().getBus();
+    return SV(t.getP(), t.getQ(), iidm::Boundary::getV(b), iidm::Boundary::getAngle(b)).otherSideQ(m_parent);
+}
+
+stdcxx::optional<Branch::Side> Boundary::getSide() const {
+    return m_side;
+}
+
+const TieLine& Boundary::getTieLine() const {
+    return dynamic_cast<const TieLine&>(getConnectable());
+}
+
+TieLine& Boundary::getTieLine() {
+    return dynamic_cast<TieLine&>(getConnectable());
+}
+
+double Boundary::getV() const {
+    const Terminal& t = getTieLine().getTerminal(m_side);
+    const auto& b = t.getBusView().getBus();
+    return SV(t.getP(), t.getQ(), iidm::Boundary::getV(b), iidm::Boundary::getAngle(b)).otherSideU(m_parent);
+}
+
+const VoltageLevel& Boundary::getVoltageLevel() const {
+    return getTieLine().getTerminal(m_side).getVoltageLevel();
+}
+
+VoltageLevel& Boundary::getVoltageLevel() {
+    return getTieLine().getTerminal(m_side).getVoltageLevel();
+}
+
+}  // namespace half_line
+
+}  // namespace iidm
+
+}  // namespace powsybl
diff --git a/src/iidm/HalfLineBoundary.hpp b/src/iidm/HalfLineBoundary.hpp
new file mode 100644
index 000000000..bfa1ce36a
--- /dev/null
+++ b/src/iidm/HalfLineBoundary.hpp
@@ -0,0 +1,80 @@
+/**
+ * Copyright (c) 2021, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef POWSYBL_IIDM_HALFLINEBOUNDARY_HPP
+#define POWSYBL_IIDM_HALFLINEBOUNDARY_HPP
+
+#include <powsybl/iidm/Boundary.hpp>
+
+namespace powsybl {
+
+namespace iidm {
+
+namespace tie_line {
+
+class HalfLine;
+
+}  // namespace tie_line
+
+class Bus;
+class Terminal;
+class TieLine;
+
+namespace half_line {
+
+class Boundary : public iidm::Boundary {
+public:  // iidm::Boundary
+    double getAngle() const override;
+
+    const Connectable& getConnectable() const override;
+
+    Connectable& getConnectable() override;
+
+    double getP() const override;
+
+    double getQ() const override;
+
+    stdcxx::optional<Branch::Side> getSide() const override;
+
+    double getV() const override;
+
+    const VoltageLevel& getVoltageLevel() const override;
+
+    VoltageLevel& getVoltageLevel() override;
+
+public:
+    Boundary(tie_line::HalfLine& halfLine, const Branch::Side& side);
+
+    Boundary(const Boundary&) = delete;
+
+    Boundary(Boundary&&) = delete;
+
+    ~Boundary() noexcept override = default;
+
+    Boundary& operator=(const Boundary&) = delete;
+
+    Boundary& operator=(Boundary&&) noexcept = delete;
+
+private:
+    const TieLine& getTieLine() const;
+
+    TieLine& getTieLine();
+
+private:
+    tie_line::HalfLine& m_parent;
+
+    Branch::Side m_side;
+};
+
+}  // namespace half_line
+
+}  // namespace iidm
+
+}  // namespace powsybl
+
+#endif  // POWSYBL_IIDM_HALFLINEBOUNDARY_HPP
+
diff --git a/src/iidm/NodeBreakerVoltageLevel.cpp b/src/iidm/NodeBreakerVoltageLevel.cpp
index 4dd8b8526..81a595e28 100644
--- a/src/iidm/NodeBreakerVoltageLevel.cpp
+++ b/src/iidm/NodeBreakerVoltageLevel.cpp
@@ -68,6 +68,10 @@ void NodeBreakerVoltageLevel::attach(Terminal& terminal, bool test) {
 
         // create the link terminal <-> graph vertex
         m_graph.setVertexObject(node, stdcxx::ref(nodeTerminal));
+
+        getNetwork().getVariantManager().forEachVariant([this]() {
+            invalidateCache();
+        });
     }
 }
 
@@ -86,6 +90,10 @@ void NodeBreakerVoltageLevel::clean() {
 bool NodeBreakerVoltageLevel::connect(Terminal& terminal) {
     auto& nodeTerminal = dynamic_cast<NodeTerminal&>(terminal);
 
+    if (terminal.isConnected()) {
+        return false;
+    }
+
     unsigned long node = nodeTerminal.getNode();
 
     // find all paths starting from the current terminal to a busbar section that does not contain an open disconnector
@@ -125,7 +133,9 @@ void NodeBreakerVoltageLevel::detach(Terminal& terminal) {
     assert(node < m_graph.getVertexCount());
     assert(stdcxx::areSame(m_graph.getVertexObject(node).get(), nodeTerminal));
 
-    invalidateCache();
+    getNetwork().getVariantManager().forEachVariant([this]() {
+        invalidateCache();
+    });
 
     // remove the link terminal <-> graph vertex
     m_graph.setVertexObject(node, stdcxx::ref<NodeTerminal>());
@@ -135,6 +145,10 @@ void NodeBreakerVoltageLevel::detach(Terminal& terminal) {
 bool NodeBreakerVoltageLevel::disconnect(Terminal& terminal) {
     auto& nodeTerminal = dynamic_cast<NodeTerminal&>(terminal);
 
+    if (!terminal.isConnected()) {
+        return false;
+    }
+
     unsigned long node = nodeTerminal.getNode();
 
     // find all paths starting from the current terminal to a busbar section that does not contain an open disconnector
@@ -323,7 +337,8 @@ void NodeBreakerVoltageLevel::invalidateCache() {
     m_variants.get().getCalculatedBusTopology().invalidateCache();
     m_variants.get().getCalculatedBusBreakerTopology().invalidateCache();
 
-    // TODO(mathbagu): invalidate the connected and synchronous components
+    getNetwork().getConnectedComponentsManager().invalidate();
+    getNetwork().getSynchronousComponentsManager().invalidate();
 }
 
 bool NodeBreakerVoltageLevel::isConnected(const Terminal& terminal) const {
diff --git a/src/iidm/ValidationUtils.cpp b/src/iidm/ValidationUtils.cpp
index 470ebc1b6..a3f160bbf 100644
--- a/src/iidm/ValidationUtils.cpp
+++ b/src/iidm/ValidationUtils.cpp
@@ -129,34 +129,6 @@ double checkG2(const Validable& validable, double g2) {
     return g2;
 }
 
-void checkHalf(const Validable& validable, const TieLine::HalfLine& half, int num) {
-    checkNotEmpty(validable, half.getId(), stdcxx::format("id is not set for half line %1%", num));
-    if (std::isnan(half.getB1())) {
-        throw ValidationException(validable, stdcxx::format("b1 is not set for half line %1%", num));
-    }
-    if (std::isnan(half.getB2())) {
-        throw ValidationException(validable, stdcxx::format("b2 is not set for half line %1%", num));
-    }
-    if (std::isnan(half.getG1())) {
-        throw ValidationException(validable, stdcxx::format("g1 is not set for half line %1%", num));
-    }
-    if (std::isnan(half.getG2())) {
-        throw ValidationException(validable, stdcxx::format("g2 is not set for half line %1%", num));
-    }
-    if (std::isnan(half.getR())) {
-        throw ValidationException(validable, stdcxx::format("r is not set for half line %1%", num));
-    }
-    if (std::isnan(half.getX())) {
-        throw ValidationException(validable, stdcxx::format("x is not set for half line %1%", num));
-    }
-    if (std::isnan(half.getXnodeP())) {
-        throw ValidationException(validable, stdcxx::format("xnodeP is not set for half line %1%", num));
-    }
-    if (std::isnan(half.getXnodeQ())) {
-        throw ValidationException(validable, stdcxx::format("xnodeQ is not set for half line %1%", num));
-    }
-}
-
 double checkHvdcActivePowerSetpoint(const Validable& validable, double activePowerSetpoint) {
     if (std::isnan(activePowerSetpoint)) {
         throw createInvalidValueException(validable, activePowerSetpoint, "active power setpoint");
diff --git a/src/iidm/converter/ConversionParameters.hpp b/src/iidm/converter/ConversionParameters.hpp
index bb603b4a2..b65b37654 100644
--- a/src/iidm/converter/ConversionParameters.hpp
+++ b/src/iidm/converter/ConversionParameters.hpp
@@ -34,12 +34,12 @@ class ConversionParameters {
 public:
     ConversionParameters() = delete;
 
-    ~ConversionParameters() = delete;
-
     ConversionParameters(const ConversionParameters&) = delete;
 
     ConversionParameters(ConversionParameters&&) noexcept = delete;
 
+    ~ConversionParameters() = delete;
+
     ConversionParameters& operator=(const ConversionParameters&) = delete;
 
     ConversionParameters& operator=(ConversionParameters&&) noexcept = delete;
diff --git a/src/iidm/converter/Parameter.hpp b/src/iidm/converter/Parameter.hpp
index 70cb26a39..7f61eaf3d 100644
--- a/src/iidm/converter/Parameter.hpp
+++ b/src/iidm/converter/Parameter.hpp
@@ -31,12 +31,12 @@ class Parameter {
 public:
     Parameter(std::string&& name, const Type& type, std::string&& description, std::string&& defaultValue);
 
-    ~Parameter() = default;
-
     Parameter(const Parameter&) = default;
 
     Parameter(Parameter&&) noexcept = default;
 
+    ~Parameter() = default;
+
     Parameter& operator=(const Parameter&) = default;
 
     Parameter& operator=(Parameter&&) = default;
diff --git a/src/iidm/converter/xml/IidmXmlVersion.cpp b/src/iidm/converter/xml/IidmXmlVersion.cpp
index 4a2d646aa..660dc1dc0 100644
--- a/src/iidm/converter/xml/IidmXmlVersion.cpp
+++ b/src/iidm/converter/xml/IidmXmlVersion.cpp
@@ -65,14 +65,15 @@ const IidmXmlVersions& IidmXmlVersion::all() {
         std::cref(IidmXmlVersion::V1_1()),
         std::cref(IidmXmlVersion::V1_2()),
         std::cref(IidmXmlVersion::V1_3()),
-        std::cref(IidmXmlVersion::V1_4())
+        std::cref(IidmXmlVersion::V1_4()),
+        std::cref(IidmXmlVersion::V1_5())
     }};
 
     return s_versions;
 }
 
 const IidmXmlVersion& IidmXmlVersion::CURRENT_IIDM_XML_VERSION() {
-    return V1_4();
+    return V1_5();
 }
 
 const IidmXmlVersion& IidmXmlVersion::fromNamespaceURI(const std::string& namespaceURI) {
@@ -145,6 +146,11 @@ const IidmXmlVersion& IidmXmlVersion::V1_4() {
     return V1_4;
 }
 
+const IidmXmlVersion& IidmXmlVersion::V1_5() {
+    static IidmXmlVersion V1_5("powsybl.org", {{1, 5}});
+    return V1_5;
+}
+
 }  // namespace xml
 
 }  // namespace converter
diff --git a/src/iidm/converter/xml/NetworkXml.cpp b/src/iidm/converter/xml/NetworkXml.cpp
index e810a60b0..7468cfdd1 100644
--- a/src/iidm/converter/xml/NetworkXml.cpp
+++ b/src/iidm/converter/xml/NetworkXml.cpp
@@ -163,7 +163,7 @@ void writeExtensionNamespaces(const Network& network, NetworkXmlWriterContext& c
 }
 
 void writeExtension(const Extension& extension, NetworkXmlWriterContext& context) {
-    powsybl::xml::XmlStreamWriter& writer = context.getExtensionsWriter();
+    powsybl::xml::XmlStreamWriter& writer = context.getWriter();
     stdcxx::CReference<ExtensionXmlSerializer> serializer = getExtensionSerializer(context.getOptions(), extension.getName());
     if (!serializer) {
         throw AssertionError(stdcxx::format("Extension XML Serializer of %1% should not be null", extension.getName()));
@@ -184,14 +184,14 @@ void writeExtensions(const Network& network, NetworkXmlWriterContext& context) {
         if (!context.isExportedEquipment(identifiable.getId()) || boost::empty(identifiable.getExtensions()) || !context.getOptions().hasAtLeastOneExtension(identifiable.getExtensions())) {
             continue;
         }
-        context.getExtensionsWriter().writeStartElement(context.getVersion().getPrefix(), EXTENSION);
-        context.getExtensionsWriter().writeAttribute(ID, context.getAnonymizer().anonymizeString(identifiable.getId()));
+        context.getWriter().writeStartElement(context.getVersion().getPrefix(), EXTENSION);
+        context.getWriter().writeAttribute(ID, context.getAnonymizer().anonymizeString(identifiable.getId()));
         for (const auto& extension : identifiable.getExtensions()) {
             if (context.getOptions().withExtension(extension.getName())) {
                 writeExtension(extension, context);
             }
         }
-        context.getExtensionsWriter().writeEndElement();
+        context.getWriter().writeEndElement();
     }
 }
 
diff --git a/src/iidm/converter/xml/NetworkXmlWriterContext.cpp b/src/iidm/converter/xml/NetworkXmlWriterContext.cpp
index 6567929f7..c78b1062a 100644
--- a/src/iidm/converter/xml/NetworkXmlWriterContext.cpp
+++ b/src/iidm/converter/xml/NetworkXmlWriterContext.cpp
@@ -20,7 +20,6 @@ namespace xml {
 
 NetworkXmlWriterContext::NetworkXmlWriterContext(std::unique_ptr<Anonymizer>&& anonymizer, powsybl::xml::XmlStreamWriter& writer, const ExportOptions& options, const BusFilter& filter, const IidmXmlVersion& version) :
     m_writer(writer),
-    m_extensionsWriter(writer),
     m_anonymizer(std::move(anonymizer)),
     m_options(options),
     m_version(version),
@@ -48,10 +47,6 @@ const std::string& NetworkXmlWriterContext::getExtensionVersion(const std::strin
     return m_options.getExtensionVersion(extensionName);
 }
 
-powsybl::xml::XmlStreamWriter& NetworkXmlWriterContext::getExtensionsWriter() {
-    return m_extensionsWriter.get();
-}
-
 const BusFilter& NetworkXmlWriterContext::getFilter() const {
     return m_filter;
 }
@@ -72,10 +67,6 @@ bool NetworkXmlWriterContext::isExportedEquipment(const std::string& id) {
     return m_exportedEquipments.find(id) != m_exportedEquipments.end();
 }
 
-void NetworkXmlWriterContext::setExtensionsWriter(powsybl::xml::XmlStreamWriter& extensionsWriter) {
-    m_extensionsWriter = std::ref(extensionsWriter);
-}
-
 }  // namespace xml
 
 }  // namespace converter
diff --git a/src/iidm/converter/xml/TerminalRefXml.cpp b/src/iidm/converter/xml/TerminalRefXml.cpp
index c8777a177..1b149dac8 100644
--- a/src/iidm/converter/xml/TerminalRefXml.cpp
+++ b/src/iidm/converter/xml/TerminalRefXml.cpp
@@ -9,6 +9,7 @@
 
 #include <powsybl/AssertionError.hpp>
 #include <powsybl/iidm/Branch.hpp>
+#include <powsybl/iidm/BusbarSection.hpp>
 #include <powsybl/iidm/Enum.hpp>
 #include <powsybl/iidm/Network.hpp>
 #include <powsybl/iidm/PhaseTapChanger.hpp>
@@ -18,6 +19,7 @@
 #include <powsybl/iidm/converter/Anonymizer.hpp>
 #include <powsybl/iidm/converter/Constants.hpp>
 #include <powsybl/iidm/converter/xml/NetworkXmlWriterContext.hpp>
+#include <powsybl/stdcxx/instanceof.hpp>
 #include <powsybl/xml/XmlStreamWriter.hpp>
 
 namespace powsybl {
@@ -57,6 +59,11 @@ void TerminalRefXml::writeTerminalRef(const Terminal& terminal, NetworkXmlWriter
     if (!context.getFilter().test(c)) {
         throw PowsyblException(stdcxx::format("Oups, terminal ref point to a filtered equipment %1%", c.get().getId()));
     }
+    if (terminal.getVoltageLevel().getTopologyKind() == TopologyKind::NODE_BREAKER &&
+            context.getOptions().getTopologyLevel() != TopologyLevel::NODE_BREAKER &&
+            stdcxx::isInstanceOf<BusbarSection>(terminal.getConnectable())) {
+        throw PowsyblException(stdcxx::format("Terminal ref should not point to a busbar section (here %1%). Try to export in node-breaker or delete this terminal ref.", terminal.getConnectable().get().getId()));
+    }
     writer.writeStartElement(nsPrefix, elementName);
     writer.writeAttribute(ID, context.getAnonymizer().anonymizeString(c.get().getId()));
     if (c.get().getTerminals().size() > 1) {
diff --git a/src/iidm/converter/xml/TieLineXml.cpp b/src/iidm/converter/xml/TieLineXml.cpp
index 6bde4484c..affd67054 100644
--- a/src/iidm/converter/xml/TieLineXml.cpp
+++ b/src/iidm/converter/xml/TieLineXml.cpp
@@ -18,6 +18,13 @@ namespace converter {
 
 namespace xml {
 
+void TieLineXml::checkBoundaryValue(double imported, double calculated, const std::string& name, const std::string& tlId) {
+    if (!std::isnan(imported) && imported != calculated) {
+        logging::Logger& logger = logging::LoggerFactory::getLogger<TieLineXml>();
+        logger.info(stdcxx::format("%1% of TieLine %2% is recalculated. Its imported value is not used (imported value = %3%; calculated value = %4%)", name, tlId, imported, calculated));
+    }
+}
+
 TieLineAdder TieLineXml::createAdder(Network& network) const {
     return network.newTieLine();
 }
@@ -40,8 +47,6 @@ void TieLineXml::readHalf(TieLineAdder::HalfLineAdder adder, const NetworkXmlRea
     const auto& b1 = context.getReader().getAttributeValue<double>(toString(B1_, side));
     const auto& g2 = context.getReader().getAttributeValue<double>(toString(G2_, side));
     const auto& b2 = context.getReader().getAttributeValue<double>(toString(B2_, side));
-    const auto& xnodeP = context.getReader().getAttributeValue<double>(toString(XNODE_P_, side));
-    const auto& xnodeQ = context.getReader().getAttributeValue<double>(toString(XNODE_Q_, side));
     adder.setId(id)
         .setName(name)
         .setR(r)
@@ -49,9 +54,7 @@ void TieLineXml::readHalf(TieLineAdder::HalfLineAdder adder, const NetworkXmlRea
         .setG1(g1)
         .setB1(b1)
         .setG2(g2)
-        .setB2(b2)
-        .setXnodeP(xnodeP)
-        .setXnodeQ(xnodeQ);
+        .setB2(b2);
 
     IidmXmlUtil::runFromMinimumVersion(IidmXmlVersion::V1_3(), context.getVersion(), [&context, &side, &adder]() {
         bool fictitious = context.getReader().getOptionalAttributeValue(toString(FICTITIOUS_, side), false);
@@ -68,6 +71,18 @@ TieLine& TieLineXml::readRootElementAttributes(TieLineAdder& adder, NetworkXmlRe
     TieLine& tl = adder.setUcteXnodeCode(ucteXnodeCode).add();
     readPQ(tl.getTerminal1(), context.getReader(), 1);
     readPQ(tl.getTerminal2(), context.getReader(), 2);
+    IidmXmlUtil::runUntilMaximumVersion(IidmXmlVersion::V1_4(), context.getVersion(), [&context, &tl]() {
+        double half1BoundaryP = context.getReader().getOptionalAttributeValue(toString(XNODE_P_, 1), stdcxx::nan());
+        double half2BoundaryP = context.getReader().getOptionalAttributeValue(toString(XNODE_P_, 2), stdcxx::nan());
+        double half1BoundaryQ = context.getReader().getOptionalAttributeValue(toString(XNODE_Q_, 1), stdcxx::nan());
+        double half2BoundaryQ = context.getReader().getOptionalAttributeValue(toString(XNODE_Q_, 1), stdcxx::nan());
+        context.addEndTask([&tl, half1BoundaryP, half2BoundaryP, half1BoundaryQ, half2BoundaryQ]() {
+            checkBoundaryValue(half1BoundaryP, tl.getHalf1().getBoundary().getP(), toString(XNODE_P_, 1), tl.getId());
+            checkBoundaryValue(half2BoundaryP, tl.getHalf2().getBoundary().getP(), toString(XNODE_P_, 2), tl.getId());
+            checkBoundaryValue(half1BoundaryQ, tl.getHalf1().getBoundary().getQ(), toString(XNODE_Q_, 1), tl.getId());
+            checkBoundaryValue(half2BoundaryQ, tl.getHalf2().getBoundary().getQ(), toString(XNODE_P_, 2), tl.getId());
+        });
+    });
     return tl;
 }
 
@@ -86,6 +101,7 @@ void TieLineXml::readSubElements(TieLine& line, NetworkXmlReaderContext& context
 }
 
 void TieLineXml::writeHalf(const TieLine::HalfLine& halfLine, NetworkXmlWriterContext& context, int side) {
+    const Boundary& boundary = halfLine.getBoundary();
     context.getWriter().writeAttribute(toString(ID_, side), context.getAnonymizer().anonymizeString(halfLine.getId()));
     if (halfLine.getId() != halfLine.getName()) {
         context.getWriter().writeAttribute(toString(NAME_, side), context.getAnonymizer().anonymizeString(halfLine.getName()));
@@ -96,8 +112,10 @@ void TieLineXml::writeHalf(const TieLine::HalfLine& halfLine, NetworkXmlWriterCo
     context.getWriter().writeAttribute(toString(B1_, side), halfLine.getB1());
     context.getWriter().writeAttribute(toString(G2_, side), halfLine.getG2());
     context.getWriter().writeAttribute(toString(B2_, side), halfLine.getB2());
-    context.getWriter().writeAttribute(toString(XNODE_P_, side), halfLine.getXnodeP());
-    context.getWriter().writeAttribute(toString(XNODE_Q_, side), halfLine.getXnodeQ());
+    IidmXmlUtil::runUntilMaximumVersion(IidmXmlVersion::V1_4(), context.getVersion(), [&context, &side, &boundary]() {
+        context.getWriter().writeAttribute(toString(XNODE_P_, side), boundary.getP());
+        context.getWriter().writeAttribute(toString(XNODE_Q_, side), boundary.getQ());
+    });
 
     IidmXmlUtil::runFromMinimumVersion(IidmXmlVersion::V1_3(), context.getVersion(), [&context, &side, &halfLine]() {
         context.getWriter().writeOptionalAttribute(toString(FICTITIOUS_, side), halfLine.isFictitious(), false);
diff --git a/src/iidm/converter/xml/TieLineXml.hpp b/src/iidm/converter/xml/TieLineXml.hpp
index 0ffe3d53b..7aa283256 100644
--- a/src/iidm/converter/xml/TieLineXml.hpp
+++ b/src/iidm/converter/xml/TieLineXml.hpp
@@ -40,6 +40,8 @@ class TieLineXml : public AbstractConnectableXml<TieLine, TieLineAdder, Network>
     void writeSubElements(const TieLine& line, const Network& network, NetworkXmlWriterContext& context) const override;
 
 private:
+    static void checkBoundaryValue(double imported, double calculated, const std::string& name, const std::string& tlId);
+
     static void readHalf(TieLineAdder::HalfLineAdder adder, const NetworkXmlReaderContext& context, int side);
 
     static void writeHalf(const TieLine::HalfLine& halfLine, NetworkXmlWriterContext& context, int side);
diff --git a/src/iidm/extensions/LoadDetailXmlSerializer.cpp b/src/iidm/extensions/LoadDetailXmlSerializer.cpp
index 80338e8dc..72cac1779 100644
--- a/src/iidm/extensions/LoadDetailXmlSerializer.cpp
+++ b/src/iidm/extensions/LoadDetailXmlSerializer.cpp
@@ -59,10 +59,10 @@ Extension& LoadDetailXmlSerializer::read(Extendable& extendable, converter::xml:
 
 void LoadDetailXmlSerializer::write(const Extension& extension, converter::xml::NetworkXmlWriterContext& context) const {
     const auto& detail = safeCast<iidm::extensions::LoadDetail>(extension);
-    context.getExtensionsWriter().writeAttribute("fixedActivePower", detail.getFixedActivePower());
-    context.getExtensionsWriter().writeAttribute("fixedReactivePower", detail.getFixedReactivePower());
-    context.getExtensionsWriter().writeAttribute("variableActivePower", detail.getVariableActivePower());
-    context.getExtensionsWriter().writeAttribute("variableReactivePower", detail.getVariableReactivePower());
+    context.getWriter().writeAttribute("fixedActivePower", detail.getFixedActivePower());
+    context.getWriter().writeAttribute("fixedReactivePower", detail.getFixedReactivePower());
+    context.getWriter().writeAttribute("variableActivePower", detail.getVariableActivePower());
+    context.getWriter().writeAttribute("variableReactivePower", detail.getVariableReactivePower());
 }
 
 }  // namespace extensions
diff --git a/src/iidm/util/SV.cpp b/src/iidm/util/SV.cpp
new file mode 100644
index 000000000..7d0bc7e8c
--- /dev/null
+++ b/src/iidm/util/SV.cpp
@@ -0,0 +1,191 @@
+/**
+ * Copyright (c) 2021, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <powsybl/iidm/util/SV.hpp>
+
+#include <powsybl/iidm/DanglingLine.hpp>
+#include <powsybl/iidm/Line.hpp>
+#include <powsybl/iidm/TieLine.hpp>
+#include <powsybl/iidm/TwoWindingsTransformer.hpp>
+#include <powsybl/stdcxx/math.hpp>
+
+namespace powsybl {
+
+namespace iidm {
+
+SV::SV(double p, double q, double u, double a) :
+    m_p(p),
+    m_q(q),
+    m_u(u),
+    m_a(a),
+    m_s1(p, q),
+    m_u1(std::polar(u, a * stdcxx::toRadians)),
+    m_v1(m_u1 / sqrt(3.0)),
+    m_i1(std::conj(m_s1 / (m_v1 * 3.0))) {
+}
+
+std::complex<double> SV::computeS2(const std::complex<double>& y1, const std::complex<double>& y2, const std::complex<double>& z, double rho) const {
+    std::complex<double> v1p = m_v1 * rho;
+    std::complex<double> i1p = m_i1 / rho;
+
+    std::complex<double> i2p = i1p - (y1 * v1p);
+    std::complex<double> v2 = v1p - (z * i2p);
+    std::complex<double> i2 = i2p - (y2 * v2);
+    return v2 * 3.0 * std::conj(i2);
+}
+
+std::complex<double> SV::computeS2(const std::complex<double>& y, const std::complex<double>& z, double rho) const {
+    return computeS2(y, std::complex<double>(), z, rho);
+}
+
+std::complex<double> SV::computeU2(const std::complex<double>& y1, const std::complex<double>& /*y2*/, const std::complex<double>& z, double rho) const {
+    std::complex<double> v1p = m_v1 * rho;
+    std::complex<double> i1p = m_i1 / rho;
+
+    std::complex<double> i2p = i1p - (y1 * v1p);
+    std::complex<double> v2 = v1p - (z * i2p);
+    return v2 * std::sqrt(3.0);
+}
+
+std::complex<double> SV::computeU2(const std::complex<double>& y, const std::complex<double>& z, double rho) const {
+    return computeU2(y, std::complex<double>(0, 0), z, rho);
+}
+
+double SV::getA() const {
+    return m_a;
+}
+
+double SV::getB(const TwoWindingsTransformer& twt) {
+    return twt.getB() * (twt.hasRatioTapChanger() ? 1 + twt.getRatioTapChanger().getCurrentStep().getB() / 100 : 1.0);
+}
+
+double SV::getG(const TwoWindingsTransformer& twt) {
+    return twt.getG() * (twt.hasRatioTapChanger() ? 1 + twt.getRatioTapChanger().getCurrentStep().getG() / 100 : 1.0);
+}
+
+double SV::getP() const {
+    return m_p;
+}
+
+double SV::getQ() const {
+    return m_q;
+}
+
+double SV::getR(const TwoWindingsTransformer& twt) {
+    return twt.getR() * (twt.hasRatioTapChanger() ? 1 + twt.getRatioTapChanger().getCurrentStep().getR() / 100 : 1.0);
+}
+
+double SV::getRho(const TwoWindingsTransformer& twt) {
+    return twt.getRatedU2() / twt.getRatedU1() * (twt.hasRatioTapChanger() ? 1 + twt.getRatioTapChanger().getCurrentStep().getRho() / 100 : 1.0);
+}
+
+double SV::getU() const {
+    return m_u;
+}
+
+double SV::getX(const TwoWindingsTransformer& twt) {
+    return twt.getX() * (twt.hasRatioTapChanger() ? 1 + twt.getRatioTapChanger().getCurrentStep().getX() / 100 : 1.0);
+}
+
+SV SV::otherSide(double r, double x, double g, double b, double rho) const {
+    std::complex<double> z(r, x);
+    std::complex<double> y(g, b);
+    std::complex<double> u2 = computeU2(y, z, rho);
+    std::complex<double> s2 = computeS2(y, z, rho);
+    return {-s2.real(), -s2.imag(), std::abs(u2), std::arg(u2) * stdcxx::toDegrees};
+}
+
+SV SV::otherSide(double r, double x, double g1, double b1, double g2, double b2, double rho) const {
+    std::complex<double> z (r, x);
+    std::complex<double> y1(g1, b1);
+    std::complex<double> y2(g2, b2);
+    std::complex<double> u2 = computeU2(y1, y2, z, rho);
+    std::complex<double> s2 = computeS2(y1, y2, z, rho);
+    return {-s2.real(), -s2.imag(), std::abs(u2), std::arg(u2) * stdcxx::toDegrees};
+}
+
+SV SV::otherSide(const TwoWindingsTransformer& twt) const {
+    return otherSide(getR(twt), getX(twt), getG(twt), getB(twt), getRho(twt));
+}
+
+SV SV::otherSide(const Line& line) const {
+    return otherSide(line.getR(), line.getX(), line.getG1() + line.getG2(), line.getB1() + line.getB2(), 1);
+}
+
+SV SV::otherSide(const DanglingLine& danglingLine) const {
+    return otherSide(danglingLine.getR(), danglingLine.getX(), danglingLine.getG() / 2.0, danglingLine.getB() / 2.0, danglingLine.getG() / 2.0, danglingLine.getB() / 2.0, 1);
+}
+
+double SV::otherSideA(double r, double x, double g1, double b1, double rho) const {
+    std::complex<double> z(r, x);
+    std::complex<double> y1(g1, b1);
+    std::complex<double> u2 = computeU2(y1, std::complex<double>(), z, rho);
+    return std::arg(u2) * stdcxx::toDegrees;
+}
+
+double SV::otherSideA(const TieLine::HalfLine& halfLine) const {
+    return otherSideA(halfLine.getR(), halfLine.getX(), halfLine.getG1(), halfLine.getB1(), 1.0);
+}
+
+double SV::otherSideA(const DanglingLine& danglingLine) const {
+    return otherSideA(danglingLine.getR(), danglingLine.getX(), danglingLine.getG() / 2.0, danglingLine.getB() / 2.0, 1.0);
+}
+
+double SV::otherSideP(double r, double x, double g1, double b1, double g2, double b2, double rho) const {
+    std::complex<double> z(r, x);
+    std::complex<double> y1(g1, b1);
+    std::complex<double> y2(g2, b2);
+    std::complex<double> s2 = computeS2(y1, y2, z, rho);
+    return -s2.real();
+}
+
+double SV::otherSideP(const DanglingLine& danglingLine) const {
+    return otherSideP(danglingLine.getR(), danglingLine.getX(), danglingLine.getG() / 2.0, danglingLine.getB() / 2.0, danglingLine.getG() / 2.0, danglingLine.getB() / 2.0, 1);
+}
+
+double SV::otherSideP(const TieLine::HalfLine& halfLine) const {
+    return otherSideP(halfLine.getR(), halfLine.getX(), halfLine.getG1(), halfLine.getB1(), halfLine.getG2(), halfLine.getB2(), 1.0);
+}
+
+double SV::otherSideQ(double r, double x, double g1, double b1, double g2, double b2, double rho) const {
+    std::complex<double> z (r, x);
+    std::complex<double> y1(g1, b1);
+    std::complex<double> y2(g2, b2);
+    std::complex<double> s2 = computeS2(y1, y2, z, rho);
+    return -s2.imag();
+}
+
+double SV::otherSideQ(const TieLine::HalfLine& halfLine) const {
+    return otherSideQ(halfLine.getR(), halfLine.getX(), halfLine.getG1(), halfLine.getB1(), halfLine.getG2(), halfLine.getB2(), 1.0);
+}
+
+double SV::otherSideQ(const DanglingLine& danglingLine) const {
+    return otherSideQ(danglingLine.getR(), danglingLine.getX(), danglingLine.getG() / 2.0, danglingLine.getB() / 2.0, danglingLine.getG() / 2.0, danglingLine.getB() / 2.0, 1);
+}
+
+double SV::otherSideU(double r, double x, double g1, double b1, double rho) const {
+    std::complex<double> z(r, x);
+    std::complex<double> y1(g1, b1);
+    std::complex<double> u2 = computeU2(y1, std::complex<double>(), z, rho);
+    return std::abs(u2);
+}
+
+double SV::otherSideU(const TieLine::HalfLine& halfLine) const {
+    return otherSideU(halfLine.getR(), halfLine.getX(), halfLine.getG1(), halfLine.getB1(), 1.0);
+}
+
+double SV::otherSideU(const DanglingLine& danglingLine) const {
+    return otherSideU(danglingLine.getR(), danglingLine.getX(), danglingLine.getG() / 2.0, danglingLine.getB() / 2.0, 1);
+}
+
+SV SV::otherSideY1Y2(const Line& line) const {
+    return otherSide(line.getR(), line.getX(), line.getG1(), line.getB1(), line.getG2(), line.getB2(), 1);
+}
+
+}  // namespace iidm
+
+}  // namespace powsybl
diff --git a/src/test/ResourceFixture.cpp b/src/test/ResourceFixture.cpp
index 4feb4cf7c..92ca6ccd9 100644
--- a/src/test/ResourceFixture.cpp
+++ b/src/test/ResourceFixture.cpp
@@ -9,6 +9,8 @@
 
 #include <fstream>
 
+#include <boost/algorithm/string.hpp>
+#include <boost/config.hpp>
 #include <boost/filesystem/operations.hpp>
 #include <boost/filesystem/path.hpp>
 
@@ -28,6 +30,19 @@ ResourceFixture::ResourceFixture() {
     parse(desc);
 }
 
+std::string getOSName() {
+    std::string osName = BOOST_PLATFORM;
+    boost::replace_all(osName, " ", "");
+    boost::replace_all(osName, "/", "");
+    boost::to_lower(osName);
+    return osName;
+}
+
+const std::string& getNormalizedOSName() {
+    static std::string s_osName = getOSName();
+    return s_osName;
+}
+
 std::string ResourceFixture::getResource(const std::string& name) const {
     const boost::filesystem::path& path = getResourcePath(name);
 
@@ -48,8 +63,11 @@ std::string ResourceFixture::getResource(const std::string& name) const {
 
 boost::filesystem::path ResourceFixture::getResourcePath(const std::string& name) const {
     boost::filesystem::path path(getOptionValue("resources").as<std::string>());
-    path /= name;
-    return path;
+    const std::string& osCustomName = (path / name).string() + "." + getNormalizedOSName();
+    if (boost::filesystem::exists(osCustomName)) {
+        return osCustomName;
+    }
+    return path / name;
 }
 
 }  // namespace test
diff --git a/test/iidm/CMakeLists.txt b/test/iidm/CMakeLists.txt
index 681d9d146..8afb0cb1b 100644
--- a/test/iidm/CMakeLists.txt
+++ b/test/iidm/CMakeLists.txt
@@ -29,6 +29,7 @@ set(UNIT_TEST_SOURCES
     NetworkFactory.cpp
     NetworkIndexTest.cpp
     NetworkTest.cpp
+    NodeBreakerConnectTest.cpp
     NodeBreakerVoltageLevelTest.cpp
     PhaseTapChangerTest.cpp
     RatioTapChangerTest.cpp
@@ -54,6 +55,7 @@ set(UNIT_TEST_SOURCES
     extensions/LoadDetailTest.cpp
     extensions/SlackTerminalTest.cpp
 
+    util/SVTest.cpp
     util/TerminalFinderTest.cpp
 )
 
diff --git a/test/iidm/CountryTest.cpp b/test/iidm/CountryTest.cpp
index 69d1063ae..7e090e496 100644
--- a/test/iidm/CountryTest.cpp
+++ b/test/iidm/CountryTest.cpp
@@ -22,11 +22,13 @@ BOOST_AUTO_TEST_SUITE(CountryTestSuite)
 BOOST_AUTO_TEST_CASE(getCountryCodeTest) {
     BOOST_CHECK_EQUAL(u8"FR", Enum::toString(Country::FR));
     BOOST_CHECK_EQUAL(u8"BE", Enum::toString(Country::BE));
+    BOOST_CHECK_EQUAL(u8"XK", Enum::toString(Country::XK));
 }
 
 BOOST_AUTO_TEST_CASE(getCountryFromCodeTest) {
     POWSYBL_ASSERT_ENUM_EQ(Country::FR, Enum::fromString<Country>(u8"FR"));
     POWSYBL_ASSERT_ENUM_EQ(Country::BE, Enum::fromString<Country>(u8"BE"));
+    POWSYBL_ASSERT_ENUM_EQ(Country::XK, Enum::fromString<Country>(u8"XK"));
 
     POWSYBL_ASSERT_THROW(Enum::fromString<Country>(u8"INVALID"), AssertionError, "Unexpected Country name: INVALID");
 }
@@ -34,6 +36,7 @@ BOOST_AUTO_TEST_CASE(getCountryFromCodeTest) {
 BOOST_AUTO_TEST_CASE(getCountryNameTest) {
     BOOST_CHECK_EQUAL(u8"FRANCE", getCountryName(Country::FR));
     BOOST_CHECK_EQUAL(u8"BELGIUM", getCountryName(Country::BE));
+    BOOST_CHECK_EQUAL(u8"KOSOVO", getCountryName(Country::XK));
 }
 
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/test/iidm/DanglingLineTest.cpp b/test/iidm/DanglingLineTest.cpp
index cca4f38d5..f2e1c6357 100644
--- a/test/iidm/DanglingLineTest.cpp
+++ b/test/iidm/DanglingLineTest.cpp
@@ -372,6 +372,29 @@ BOOST_AUTO_TEST_CASE(currentLimits) {
     BOOST_TEST(danglingLine.getCurrentLimits());
 }
 
+BOOST_AUTO_TEST_CASE(getBoundary) {
+    Network network = createDanglingLineTestNetwork(false);
+    DanglingLine& danglingLine = network.getDanglingLine("DL1");
+    const DanglingLine& cDanglingLine = network.getDanglingLine("DL1");
+
+    danglingLine.getTerminal().getBusView().getBus().get().setAngle(2);
+    danglingLine.getTerminal().setP(3);
+    danglingLine.getTerminal().setQ(4);
+    danglingLine.getTerminal().getBusView().getBus().get().setV(5);
+    BOOST_CHECK(stdcxx::areSame(cDanglingLine.getBoundary(), danglingLine.getBoundary()));
+    const Boundary& cBoundary = danglingLine.getBoundary();
+    Boundary& boundary = danglingLine.getBoundary();
+    BOOST_CHECK_CLOSE(82.47271661854765, boundary.getAngle(), std::numeric_limits<double>::epsilon());
+    BOOST_CHECK_CLOSE(2065.500000000001, boundary.getP(), std::numeric_limits<double>::epsilon());
+    BOOST_CHECK_CLOSE(-781.1250000000001, boundary.getQ(), std::numeric_limits<double>::epsilon());
+    BOOST_CHECK_CLOSE(43.5, boundary.getV(), std::numeric_limits<double>::epsilon());
+    BOOST_CHECK(stdcxx::areSame(cDanglingLine, cBoundary.getConnectable()));
+    BOOST_CHECK(stdcxx::areSame(cDanglingLine, boundary.getConnectable()));
+    BOOST_CHECK(!boundary.getSide());
+    BOOST_CHECK(stdcxx::areSame(cDanglingLine.getTerminal().getVoltageLevel(), cBoundary.getVoltageLevel()));
+    BOOST_CHECK(stdcxx::areSame(danglingLine.getTerminal().getVoltageLevel(), boundary.getVoltageLevel()));
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
 }  // namespace iidm
diff --git a/test/iidm/NetworkFactory.cpp b/test/iidm/NetworkFactory.cpp
index 66409916c..e3b3b55a9 100644
--- a/test/iidm/NetworkFactory.cpp
+++ b/test/iidm/NetworkFactory.cpp
@@ -336,8 +336,6 @@ Network createComponentsTestNetworkBB() {
         .setUcteXnodeCode("UcteXnodeCode")
         .newHalfLine1()
         .setId("H1_TL_VL4_VL6")
-        .setXnodeP(1)
-        .setXnodeQ(2)
         .setR(6.0)
         .setX(66.0)
         .setG1(0.2)
@@ -347,8 +345,6 @@ Network createComponentsTestNetworkBB() {
         .add()
         .newHalfLine2()
         .setId("H2_TL_VL4_VL6")
-        .setXnodeP(3)
-        .setXnodeQ(4)
         .setR(7.0)
         .setX(77.0)
         .setG1(0.6)
@@ -729,8 +725,6 @@ Network createComponentsTestNetworkNB() {
         .setUcteXnodeCode("UcteXnodeCode")
         .newHalfLine1()
         .setId("H1_TL_VL4_VL6")
-        .setXnodeP(1)
-        .setXnodeQ(2)
         .setR(6.0)
         .setX(66.0)
         .setG1(0.2)
@@ -740,8 +734,6 @@ Network createComponentsTestNetworkNB() {
         .add()
         .newHalfLine2()
         .setId("H2_TL_VL4_VL6")
-        .setXnodeP(3)
-        .setXnodeQ(4)
         .setR(7.0)
         .setX(77.0)
         .setG1(0.6)
diff --git a/test/iidm/NetworkFactory.hpp b/test/iidm/NetworkFactory.hpp
index f6ec76db4..967b5239b 100644
--- a/test/iidm/NetworkFactory.hpp
+++ b/test/iidm/NetworkFactory.hpp
@@ -25,6 +25,8 @@ Network createNetwork();
 
 Terminal& getTerminalFromNetwork2();
 
+Network createDanglingLineNetwork();
+
 }  // namespace iidm
 
 }  // namespace powsybl
diff --git a/test/iidm/NetworkTest.cpp b/test/iidm/NetworkTest.cpp
index 2ad68a524..f42398f27 100644
--- a/test/iidm/NetworkTest.cpp
+++ b/test/iidm/NetworkTest.cpp
@@ -183,8 +183,6 @@ Network createTestNetwork() {
         .setUcteXnodeCode("UcteXnodeCode")
         .newHalfLine1()
         .setId("H1_TL_VL1_VL3")
-        .setXnodeP(1)
-        .setXnodeQ(2)
         .setR(6.0)
         .setX(66.0)
         .setG1(0.2)
@@ -194,8 +192,6 @@ Network createTestNetwork() {
         .add()
         .newHalfLine2()
         .setId("H2_TL_VL1_VL3")
-        .setXnodeP(3)
-        .setXnodeQ(4)
         .setR(7.0)
         .setX(77.0)
         .setG1(0.6)
diff --git a/test/iidm/NodeBreakerConnectTest.cpp b/test/iidm/NodeBreakerConnectTest.cpp
new file mode 100644
index 000000000..56404995c
--- /dev/null
+++ b/test/iidm/NodeBreakerConnectTest.cpp
@@ -0,0 +1,182 @@
+/**
+ * Copyright (c) 2021, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <boost/test/unit_test.hpp>
+
+#include <powsybl/iidm/Generator.hpp>
+#include <powsybl/iidm/GeneratorAdder.hpp>
+#include <powsybl/iidm/Load.hpp>
+#include <powsybl/iidm/LoadAdder.hpp>
+#include <powsybl/iidm/Network.hpp>
+#include <powsybl/iidm/Substation.hpp>
+#include <powsybl/iidm/SubstationAdder.hpp>
+#include <powsybl/iidm/Switch.hpp>
+#include <powsybl/iidm/SwitchAdder.hpp>
+#include <powsybl/iidm/TopologyKind.hpp>
+#include <powsybl/iidm/VoltageLevel.hpp>
+#include <powsybl/iidm/VoltageLevelAdder.hpp>
+
+namespace powsybl {
+
+namespace iidm {
+
+/**
+ * <pre>
+ *           LD        G
+ *           |    B1   |
+ *           |---[+]---|
+ *       B2 [-]       [+] B3
+ *           |    C    |
+ *  BBS1 --------[-]-------- BBS2
+ * </pre>
+ */
+Network createNbkNetwork() {
+    Network network("test", "test");
+    Substation& s = network.newSubstation()
+        .setId("S")
+        .setCountry(Country::FR)
+        .add();
+    VoltageLevel& vl = s.newVoltageLevel()
+        .setId("VL")
+        .setNominalV(400.0)
+        .setTopologyKind(TopologyKind::NODE_BREAKER)
+        .add();
+    vl.getNodeBreakerView().newBusbarSection()
+        .setId("BBS1")
+        .setNode(0)
+        .add();
+    vl.getNodeBreakerView().newBusbarSection()
+        .setId("BBS2")
+        .setNode(1)
+        .add();
+    vl.getNodeBreakerView().newBreaker()
+        .setId("C")
+        .setNode1(1)
+        .setNode2(0)
+        .setOpen(true)
+        .add();
+    vl.getNodeBreakerView().newBreaker()
+        .setId("B2")
+        .setNode1(0)
+        .setNode2(2)
+        .setOpen(true)
+        .add();
+    vl.getNodeBreakerView().newBreaker()
+        .setId("B1")
+        .setNode1(2)
+        .setNode2(3)
+        .setOpen(false)
+        .add();
+    vl.getNodeBreakerView().newBreaker()
+        .setId("B3")
+        .setNode1(3)
+        .setNode2(1)
+        .setOpen(false)
+        .add();
+    vl.newLoad()
+        .setId("LD")
+        .setNode(2)
+        .setP0(1)
+        .setQ0(1)
+        .add();
+    vl.newGenerator()
+        .setId("G")
+        .setNode(3)
+        .setMinP(-9999.99)
+        .setMaxP(9999.99)
+        .setVoltageRegulatorOn(true)
+        .setTargetV(400)
+        .setTargetP(1)
+        .setTargetQ(0)
+        .add();
+    return network;
+}
+
+/**
+ * <pre>
+ *     L
+ *     |
+ *  ---1---
+ *  |     |
+ * BR1   BR2
+ *  |     |
+ *  ---0--- BBS1
+ * </pre>
+ */
+Network createDiamondNetwork() {
+    Network network("test", "test");
+    Substation& s = network.newSubstation()
+        .setId("S")
+        .setCountry(Country::FR)
+        .add();
+    VoltageLevel& vl = s.newVoltageLevel()
+        .setId("VL")
+        .setNominalV(400.0)
+        .setTopologyKind(TopologyKind::NODE_BREAKER)
+        .add();
+    vl.getNodeBreakerView().newBusbarSection()
+        .setId("BBS1")
+        .setNode(0)
+        .add();
+    vl.newLoad()
+        .setId("L")
+        .setNode(1)
+        .setP0(1)
+        .setQ0(1)
+        .add();
+    vl.getNodeBreakerView().newBreaker()
+        .setId("BR1")
+        .setNode1(1)
+        .setNode2(0)
+        .setOpen(false)
+        .add();
+    vl.getNodeBreakerView().newBreaker()
+        .setId("BR2")
+        .setNode1(1)
+        .setNode2(0)
+        .setOpen(false)
+        .add();
+    return network;
+}
+
+BOOST_AUTO_TEST_SUITE(NetworkTestSuite)
+
+BOOST_AUTO_TEST_CASE(NodeBreakerConnectConnectedLoad) {
+    Network network = createNbkNetwork();
+    Load& l = network.getLoad("LD");
+    BOOST_CHECK(l.getTerminal().isConnected());
+    BOOST_CHECK(network.getSwitch("B2").isOpen());
+
+    l.getTerminal().connect();
+    BOOST_CHECK(network.getSwitch("B2").isOpen());
+    BOOST_CHECK(l.getTerminal().isConnected());
+}
+
+BOOST_AUTO_TEST_CASE(NodeBreakerDisconnectDisconnectedLoad) {
+    Network network = createNbkNetwork();
+    network.getSwitch("B3").setOpen(true);
+    Load& l = network.getLoad("LD");
+    BOOST_CHECK(!l.getTerminal().isConnected());
+
+    l.getTerminal().disconnect();
+    BOOST_CHECK(!network.getSwitch("B1").isOpen());
+    BOOST_CHECK(!l.getTerminal().isConnected());
+}
+
+BOOST_AUTO_TEST_CASE(NodeBreakerDisconnectionDiamond) {
+    Network network = createDiamondNetwork();
+    Load& l = network.getLoad("L");
+    BOOST_CHECK(l.getTerminal().isConnected());
+    l.getTerminal().disconnect();
+    BOOST_CHECK(!l.getTerminal().isConnected());
+}
+
+BOOST_AUTO_TEST_SUITE_END()
+
+}  // namespace iidm
+
+}  // namespace powsybl
diff --git a/test/iidm/NodeBreakerVoltageLevelTest.cpp b/test/iidm/NodeBreakerVoltageLevelTest.cpp
index 5b57adcf2..1f848dfe1 100644
--- a/test/iidm/NodeBreakerVoltageLevelTest.cpp
+++ b/test/iidm/NodeBreakerVoltageLevelTest.cpp
@@ -19,8 +19,10 @@
 #include <powsybl/iidm/Network.hpp>
 #include <powsybl/iidm/Substation.hpp>
 #include <powsybl/iidm/Switch.hpp>
+#include <powsybl/iidm/TwoWindingsTransformer.hpp>
 #include <powsybl/iidm/VoltageLevel.hpp>
 #include <powsybl/iidm/VoltageLevelAdder.hpp>
+#include <powsybl/network/FourSubstationsNodeBreakerFactory.hpp>
 
 #include <powsybl/test/AssertionUtils.hpp>
 
@@ -1186,6 +1188,62 @@ BOOST_AUTO_TEST_CASE(TestRemoveVoltageLevelWithInternalConnectionsIssue) {
     POWSYBL_ASSERT_THROW(network.getVoltageLevel("S5 10kV"), PowsyblException, "Unable to find to the identifiable 'S5 10kV'");
 }
 
+BOOST_AUTO_TEST_CASE(issue318_invalidateCache) {
+    Network network("test", "test");
+    Substation& substation = network.newSubstation()
+        .setId("S1")
+        .setCountry(Country::FR)
+        .setTso("TSO")
+        .add();
+    VoltageLevel& vl1 = substation.newVoltageLevel()
+        .setId("VL1")
+        .setTopologyKind(TopologyKind::NODE_BREAKER)
+        .setNominalV(90.0)
+        .setLowVoltageLimit(88.0)
+        .setHighVoltageLimit(96.0)
+        .add();
+
+    BusbarSection& bbs1 = vl1.getNodeBreakerView().newBusbarSection()
+        .setId("BBS1")
+        .setName("BBS1_NAME")
+        .setNode(0)
+        .add();
+
+    // In that case, the bus cache is initialized, but there is no bus for node 0
+    BOOST_CHECK(!bbs1.getTerminal().getBusView().getBus());
+
+    BusbarSection& bbs2 = vl1.getNodeBreakerView().newBusbarSection()
+        .setId("BBS2")
+        .setName("BBS2_NAME")
+        .setNode(1)
+        .add();
+
+    // Without the fix, this call throws an exception (ArrayIndexOutOfBoundsException), but an invalid reference is expected
+    BOOST_CHECK(!bbs2.getTerminal().getBusView().getBus());
+}
+
+BOOST_AUTO_TEST_CASE(NbkComprehensiveErrorMessage) {
+    Network network = powsybl::network::FourSubstationsNodeBreakerFactory::create();
+    BusbarSection& busbarSection = network.getBusbarSection("S1VL2_BBS1");
+    TwoWindingsTransformer& twt = network.getTwoWindingsTransformer("TWT");
+    twt.getPhaseTapChanger().setRegulationTerminal(stdcxx::ref(busbarSection.getTerminal()));
+
+    stdcxx::Properties properties;
+    properties.set(converter::ExportOptions::TOPOLOGY_LEVEL, "NODE_BREAKER");
+
+    std::stringstream ss;
+
+    // make sure no error is thrown while exporting to NODE_BREAKER topology
+    BOOST_CHECK_NO_THROW({
+         Network::writeXml("network.xiidm", ss, network, converter::ExportOptions(properties));
+         Network::readXml("network.xiidm", ss);
+    });
+
+    // make sure an error is thrown when exporting to BUS_BREAKER topology (see #295)
+    properties.set(converter::ExportOptions::TOPOLOGY_LEVEL, "BUS_BREAKER");
+    POWSYBL_ASSERT_THROW(Network::writeXml("network.xiidm", ss, network, converter::ExportOptions(properties)), PowsyblException, "Terminal ref should not point to a busbar section (here S1VL2_BBS1). Try to export in node-breaker or delete this terminal ref.");
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
 }  // namespace iidm
diff --git a/test/iidm/TieLineTest.cpp b/test/iidm/TieLineTest.cpp
index e4716bb38..e73639c4e 100644
--- a/test/iidm/TieLineTest.cpp
+++ b/test/iidm/TieLineTest.cpp
@@ -102,8 +102,6 @@ Network createTieLineTestNetwork() {
         .setUcteXnodeCode("UcteXnodeCode")
         .newHalfLine1()
         .setId("H1_TL_VL1_VL3")
-        .setXnodeP(1)
-        .setXnodeQ(2)
         .setR(6.0)
         .setX(66.0)
         .setG1(0.2)
@@ -113,8 +111,6 @@ Network createTieLineTestNetwork() {
         .add()
         .newHalfLine2()
         .setId("H2_TL_VL1_VL3")
-        .setXnodeP(3)
-        .setXnodeQ(4)
         .setR(7.0)
         .setX(77.0)
         .setG1(0.6)
@@ -160,8 +156,6 @@ BOOST_AUTO_TEST_CASE(constructor) {
     BOOST_CHECK_CLOSE(0.4, half1.getB1(), std::numeric_limits<double>::epsilon());
     BOOST_CHECK_CLOSE(0.3, half1.getG2(), std::numeric_limits<double>::epsilon());
     BOOST_CHECK_CLOSE(0.5, half1.getB2(), std::numeric_limits<double>::epsilon());
-    BOOST_CHECK_CLOSE(1.0, half1.getXnodeP(), std::numeric_limits<double>::epsilon());
-    BOOST_CHECK_CLOSE(2.0, half1.getXnodeQ(), std::numeric_limits<double>::epsilon());
 
     POWSYBL_ASSERT_THROW(modifiableTieLine.setR(0), ValidationException, "AC tie line 'TL_VL1_VL3': direct modification of characteristics not supported for tie lines");
     POWSYBL_ASSERT_THROW(modifiableTieLine.setX(0), ValidationException, "AC tie line 'TL_VL1_VL3': direct modification of characteristics not supported for tie lines");
@@ -195,12 +189,6 @@ BOOST_AUTO_TEST_CASE(constructor) {
     BOOST_CHECK(stdcxx::areSame(half1, modifiableHalfLine.setB2(6.0)));
     BOOST_CHECK_CLOSE(6.0, half1.getB2(), std::numeric_limits<double>::epsilon());
 
-    BOOST_CHECK(stdcxx::areSame(half1, modifiableHalfLine.setXnodeP(7.0)));
-    BOOST_CHECK_CLOSE(7.0, half1.getXnodeP(), std::numeric_limits<double>::epsilon());
-
-    BOOST_CHECK(stdcxx::areSame(half1, modifiableHalfLine.setXnodeQ(8.0)));
-    BOOST_CHECK_CLOSE(8.0, half1.getXnodeQ(), std::numeric_limits<double>::epsilon());
-
     const TieLine::HalfLine& half2 = tieLine.getHalf2();
     BOOST_CHECK_EQUAL("H2_TL_VL1_VL3", half2.getId());
     BOOST_CHECK_EQUAL("H2_TL_VL1_VL3", half2.getName());
@@ -210,8 +198,6 @@ BOOST_AUTO_TEST_CASE(constructor) {
     BOOST_CHECK_CLOSE(0.7, half2.getB1(), std::numeric_limits<double>::epsilon());
     BOOST_CHECK_CLOSE(0.9, half2.getG2(), std::numeric_limits<double>::epsilon());
     BOOST_CHECK_CLOSE(1.2, half2.getB2(), std::numeric_limits<double>::epsilon());
-    BOOST_CHECK_CLOSE(3.0, half2.getXnodeP(), std::numeric_limits<double>::epsilon());
-    BOOST_CHECK_CLOSE(4.0, half2.getXnodeQ(), std::numeric_limits<double>::epsilon());
 
     BOOST_CHECK(stdcxx::areSame(half1, tieLine.getHalf(Branch::Side::ONE)));
     BOOST_CHECK(stdcxx::areSame(half2, tieLine.getHalf(Branch::Side::TWO)));
@@ -255,8 +241,6 @@ BOOST_AUTO_TEST_CASE(adderFail) {
         .setUcteXnodeCode("UcteXnodeCodeTest")
         .newHalfLine1()
         .setId("H1_TL_VL2_VL4")
-        .setXnodeP(10)
-        .setXnodeQ(20)
         .setR(60.0)
         .setX(660.0)
         .setG1(2.0)
@@ -266,8 +250,6 @@ BOOST_AUTO_TEST_CASE(adderFail) {
         .add()
         .newHalfLine2()
         .setId("H2_TL_VL2_VL4")
-        .setXnodeP(30)
-        .setXnodeQ(40)
         .setR(70.0)
         .setX(770.0)
         .setG1(6.0)
@@ -353,11 +335,6 @@ BOOST_AUTO_TEST_CASE(adder) {
     POWSYBL_ASSERT_THROW(halfLineAdder1.add(), ValidationException, "AC tie line 'UNIQUE_TIE_LINE_ID': b2 is not set for half line 1");
     halfLineAdder1.setB2(5.0);
 
-    POWSYBL_ASSERT_THROW(halfLineAdder1.add(), ValidationException, "AC tie line 'UNIQUE_TIE_LINE_ID': xnodeP is not set for half line 1");
-    halfLineAdder1.setXnodeP(10.0);
-
-    POWSYBL_ASSERT_THROW(halfLineAdder1.add(), ValidationException, "AC tie line 'UNIQUE_TIE_LINE_ID': xnodeQ is not set for half line 1");
-    halfLineAdder1.setXnodeQ(20.0);
     halfLineAdder1.add();
 
     POWSYBL_ASSERT_THROW(tieLineAdder.add(), ValidationException, "AC tie line 'UNIQUE_TIE_LINE_ID': half line 2 is not set");
@@ -385,12 +362,6 @@ BOOST_AUTO_TEST_CASE(adder) {
 
     POWSYBL_ASSERT_THROW(halfLineAdder2.add(), ValidationException, "AC tie line 'UNIQUE_TIE_LINE_ID': b2 is not set for half line 2");
     halfLineAdder2.setB2(12.0);
-
-    POWSYBL_ASSERT_THROW(halfLineAdder2.add(), ValidationException, "AC tie line 'UNIQUE_TIE_LINE_ID': xnodeP is not set for half line 2");
-    halfLineAdder2.setXnodeP(30.0);
-
-    POWSYBL_ASSERT_THROW(halfLineAdder2.add(), ValidationException, "AC tie line 'UNIQUE_TIE_LINE_ID': xnodeQ is not set for half line 2");
-    halfLineAdder2.setXnodeQ(40.0);
     halfLineAdder2.add();
 
     halfLineAdder2.setFictitious(true);
@@ -431,8 +402,6 @@ BOOST_AUTO_TEST_CASE(fictitious) {
         .setG2(3.0)
         .setR(60.0)
         .setX(660.0)
-        .setXnodeP(10.0)
-        .setXnodeQ(20.0)
         .setFictitious(true)
         .add();
 
@@ -446,8 +415,6 @@ BOOST_AUTO_TEST_CASE(fictitious) {
         .setG2(9.0)
         .setR(70.0)
         .setX(700.0)
-        .setXnodeP(30.0)
-        .setXnodeQ(40.0)
         .setFictitious(false)
         .add();
 
@@ -457,6 +424,29 @@ BOOST_AUTO_TEST_CASE(fictitious) {
     BOOST_CHECK(line.isFictitious());
 }
 
+BOOST_AUTO_TEST_CASE(getBoundary) {
+    Network network = createTieLineTestNetwork();
+    TieLine& tieLine = dynamic_cast<TieLine&>(network.getLine("TL_VL1_VL3"));
+    const TieLine& cTieLine = dynamic_cast<const TieLine&>(network.getLine("TL_VL1_VL3"));
+
+    tieLine.getTerminal1().getBusView().getBus().get().setAngle(2);
+    tieLine.getTerminal1().setP(3);
+    tieLine.getTerminal1().setQ(4);
+    tieLine.getTerminal1().getBusView().getBus().get().setV(5);
+    BOOST_CHECK(stdcxx::areSame(cTieLine.getHalf1().getBoundary(), tieLine.getHalf1().getBoundary()));
+    const Boundary& cBoundary = tieLine.getHalf1().getBoundary();
+    Boundary& boundary = tieLine.getHalf1().getBoundary();
+    BOOST_CHECK_CLOSE(168.31385922271897, boundary.getAngle(), std::numeric_limits<double>::epsilon());
+    BOOST_CHECK_CLOSE(10051.099999999999, boundary.getP(), std::numeric_limits<double>::epsilon());
+    BOOST_CHECK_CLOSE(-16154.5, boundary.getQ(), std::numeric_limits<double>::epsilon());
+    BOOST_CHECK_CLOSE(182.584227139148, boundary.getV(), std::numeric_limits<double>::epsilon());
+    BOOST_CHECK(stdcxx::areSame(cTieLine, cBoundary.getConnectable()));
+    BOOST_CHECK(stdcxx::areSame(cTieLine, boundary.getConnectable()));
+    BOOST_CHECK_EQUAL(Branch::Side::ONE, *boundary.getSide());
+    BOOST_CHECK(stdcxx::areSame(cTieLine.getTerminal(Branch::Side::ONE).getVoltageLevel(), cBoundary.getVoltageLevel()));
+    BOOST_CHECK(stdcxx::areSame(cTieLine.getTerminal(Branch::Side::ONE).getVoltageLevel(), boundary.getVoltageLevel()));
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
 }  // namespace iidm
diff --git a/test/iidm/converter/xml/CMakeLists.txt b/test/iidm/converter/xml/CMakeLists.txt
index 9e7d3289c..603ab31dd 100644
--- a/test/iidm/converter/xml/CMakeLists.txt
+++ b/test/iidm/converter/xml/CMakeLists.txt
@@ -22,6 +22,7 @@ set(EXT_SOURCES
 set(UNIT_TEST_SOURCES
     BatteryRoundTripTest.cpp
     EurostagTest.cpp
+    ExtensionProvidersTest.cpp
     FictitiousSwitchTest.cpp
     FourSubstationsNodeBreakerTest.cpp
     HvdcRoundTripTest.cpp
diff --git a/test/iidm/converter/xml/ExtensionProvidersTest.cpp b/test/iidm/converter/xml/ExtensionProvidersTest.cpp
new file mode 100644
index 000000000..d1c5f77f6
--- /dev/null
+++ b/test/iidm/converter/xml/ExtensionProvidersTest.cpp
@@ -0,0 +1,43 @@
+/**
+ * Copyright (c) 2021, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <boost/test/unit_test.hpp>
+
+#include <powsybl/iidm/ExtensionProviders.hpp>
+#include <powsybl/iidm/converter/xml/ExtensionXmlSerializer.hpp>
+#include <powsybl/test/AssertionUtils.hpp>
+
+namespace powsybl {
+
+namespace iidm {
+
+namespace converter {
+
+namespace xml {
+
+BOOST_AUTO_TEST_SUITE(ExtensionProvidersTestSuite)
+
+BOOST_AUTO_TEST_CASE(findProvider) {
+    auto& extProvider = ExtensionProviders<converter::xml::ExtensionXmlSerializer>::getInstance();
+    BOOST_CHECK(!extProvider.findProvider("test"));
+    POWSYBL_ASSERT_THROW(extProvider.findProviderOrThrowException("test"), PowsyblException, "No provider found for extension 'test'");
+
+    BOOST_CHECK(extProvider.findProvider("loadBar"));
+    BOOST_CHECK_NO_THROW(extProvider.findProviderOrThrowException("loadBar"));
+
+    BOOST_CHECK_EQUAL(6, boost::size(extProvider.getProviders()));
+}
+
+BOOST_AUTO_TEST_SUITE_END()
+
+}  // namespace xml
+
+}  // namespace converter
+
+}  // namespace iidm
+
+}  // namespace powsybl
diff --git a/test/iidm/converter/xml/extensions/TerminalMockXmlSerializer.cpp b/test/iidm/converter/xml/extensions/TerminalMockXmlSerializer.cpp
index b855ea12a..b2e65a0c2 100644
--- a/test/iidm/converter/xml/extensions/TerminalMockXmlSerializer.cpp
+++ b/test/iidm/converter/xml/extensions/TerminalMockXmlSerializer.cpp
@@ -38,6 +38,7 @@ TerminalMockXmlSerializer::TerminalMockXmlSerializer() :
             .put(IidmXmlVersion::V1_2(), {"1.2"})
             .put(IidmXmlVersion::V1_3(), {"1.3"})
             .put(IidmXmlVersion::V1_4(), {"1.4"})
+            .put(IidmXmlVersion::V1_5(), {"1.5"})
             .build(),
         stdcxx::MapBuilder<std::string, std::string>()
             .put("1.0", "http://www.itesla_project.eu/schema/iidm/ext/terminal_mock/1_0")
@@ -45,6 +46,7 @@ TerminalMockXmlSerializer::TerminalMockXmlSerializer() :
             .put("1.2", "http://www.powsybl.org/schema/iidm/ext/terminal_mock/1_2")
             .put("1.3", "http://www.powsybl.org/schema/iidm/ext/terminal_mock/1_3")
             .put("1.4", "http://www.powsybl.org/schema/iidm/ext/terminal_mock/1_4")
+            .put("1.5", "http://www.powsybl.org/schema/iidm/ext/terminal_mock/1_5")
             .build()) {
 }
 
@@ -74,7 +76,7 @@ Extension& TerminalMockXmlSerializer::read(Extendable& extendable, NetworkXmlRea
 
 void TerminalMockXmlSerializer::write(const Extension& extension, NetworkXmlWriterContext& context) const {
     const auto& terminalMockExt = safeCast<TerminalMockExt>(extension);
-    TerminalRefXml::writeTerminalRef(terminalMockExt.getTerminal(), context, getNamespacePrefix(), "terminal", context.getExtensionsWriter());
+    TerminalRefXml::writeTerminalRef(terminalMockExt.getTerminal(), context, getNamespacePrefix(), "terminal", context.getWriter());
 }
 
 }  // namespace extensions
diff --git a/test/iidm/util/SVTest.cpp b/test/iidm/util/SVTest.cpp
new file mode 100644
index 000000000..11261081b
--- /dev/null
+++ b/test/iidm/util/SVTest.cpp
@@ -0,0 +1,151 @@
+/**
+ * Copyright (c) 2021, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <boost/test/unit_test.hpp>
+
+#include <powsybl/iidm/Bus.hpp>
+#include <powsybl/iidm/DanglingLine.hpp>
+#include <powsybl/iidm/DanglingLineAdder.hpp>
+#include <powsybl/iidm/Line.hpp>
+#include <powsybl/iidm/Network.hpp>
+#include <powsybl/iidm/Substation.hpp>
+#include <powsybl/iidm/Terminal.hpp>
+#include <powsybl/iidm/TwoWindingsTransformer.hpp>
+#include <powsybl/iidm/VoltageLevel.hpp>
+#include <powsybl/iidm/util/SV.hpp>
+#include <powsybl/network/EurostagFactory.hpp>
+
+namespace powsybl {
+
+namespace iidm {
+
+Network createDanglingLineTestNetwork() {
+    Network network("test", "test");
+    Substation& substation = network.newSubstation()
+        .setId("S1")
+        .setName("S1_NAME")
+        .setCountry(Country::FR)
+        .setTso("TSO")
+        .add();
+
+    VoltageLevel& vl1 = substation.newVoltageLevel()
+        .setId("VL1")
+        .setName("VL1_NAME")
+        .setTopologyKind(TopologyKind::BUS_BREAKER)
+        .setNominalV(380.0)
+        .setLowVoltageLimit(340.0)
+        .setHighVoltageLimit(420.0)
+        .add();
+
+    Bus& vl1Bus1 = vl1.getBusBreakerView().newBus()
+        .setId("VL1_BUS1")
+        .add();
+
+    vl1.newDanglingLine()
+        .setId("DL1")
+        .setName("DL1_NAME")
+        .setBus(vl1Bus1.getId())
+        .setConnectableBus(vl1Bus1.getId())
+        .setB(0.000193)
+        .setG(0.0)
+        .setP0(-300)
+        .setQ0(-100)
+        .setR(1.5)
+        .setX(16.5)
+        .setUcteXnodeCode("ucteXnodeCodeTest")
+        .add();
+
+    return network;
+}
+
+BOOST_AUTO_TEST_SUITE(SVTestSuite)
+
+// computation are not the same for every platforms (due to complex<double> support)
+// => increase tolerance by using a threshold bigger than std::numeric_limits<double>::epsilon()
+constexpr double ACCEPTABLE_THRESHOLD = 1e-6;
+
+BOOST_AUTO_TEST_CASE(OtherSideTwtTest) {
+    Network network = powsybl::network::EurostagFactory::createTutorial1Network();
+    TwoWindingsTransformer& twt = network.getTwoWindingsTransformer("NGEN_NHV1");
+    Terminal& terminal1 = twt.getTerminal1();
+    Bus& bus1 = terminal1.getBusBreakerView().getBus().get();
+
+    terminal1.setP(605.558349609375);
+    terminal1.setQ(225.28251647949219);
+    bus1.setV(24.500000610351563);
+    bus1.setAngle(2.3259763717651367);
+    SV sv(terminal1.getP(), terminal1.getQ(), bus1.getV(), bus1.getAngle());
+
+    const SV& otherSide = sv.otherSide(twt);
+    BOOST_CHECK_CLOSE(-604.89090825537278, otherSide.getP(), ACCEPTABLE_THRESHOLD);
+    BOOST_CHECK_CLOSE(-197.48047051265698, otherSide.getQ(), ACCEPTABLE_THRESHOLD);
+    BOOST_CHECK_CLOSE(402.142839934194, otherSide.getU(), ACCEPTABLE_THRESHOLD);
+    BOOST_CHECK_CLOSE(5.3007050229466078e-08, otherSide.getA(), ACCEPTABLE_THRESHOLD);
+}
+
+BOOST_AUTO_TEST_CASE(OtherSideLineTest) {
+    Network network = powsybl::network::EurostagFactory::createTutorial1Network();
+    Line& line = network.getLine("NHV1_NHV2_1");
+    Terminal& terminal1 = line.getTerminal1();
+    Bus& bus1 = terminal1.getBusBreakerView().getBus().get();
+
+    terminal1.setP(302.44406127929688);
+    terminal1.setQ(98.740272521972656);
+    bus1.setV(402.14284515380859);
+    bus1.setAngle(0);
+    SV sv(terminal1.getP(), terminal1.getQ(), bus1.getV(), bus1.getAngle());
+
+    const SV& otherSide = sv.otherSide(line);
+    BOOST_CHECK_CLOSE(-300.26535137698056, otherSide.getP(), ACCEPTABLE_THRESHOLD);
+    BOOST_CHECK_CLOSE(-137.19794660913607, otherSide.getQ(), ACCEPTABLE_THRESHOLD);
+    BOOST_CHECK_CLOSE(387.38198654517674, otherSide.getU(), ACCEPTABLE_THRESHOLD);
+    BOOST_CHECK_CLOSE(-3.4951525055825536, otherSide.getA(), ACCEPTABLE_THRESHOLD);
+}
+
+BOOST_AUTO_TEST_CASE(OtherSideDanglingLineTest) {
+    Network network = createDanglingLineTestNetwork();
+    DanglingLine& dl = network.getDanglingLine("DL1");
+    Terminal& terminal1 = dl.getTerminal();
+    Bus& bus1 = terminal1.getBusBreakerView().getBus().get();
+
+    terminal1.setP(302.44406127929688);
+    terminal1.setQ(98.740272521972656);
+    bus1.setV(402.14284515380859);
+    bus1.setAngle(0);
+    SV sv(terminal1.getP(), terminal1.getQ(), bus1.getV(), bus1.getAngle());
+
+    const SV& otherSide = sv.otherSide(dl);
+    BOOST_CHECK_CLOSE(-301.47434650169686, otherSide.getP(), ACCEPTABLE_THRESHOLD);
+    BOOST_CHECK_CLOSE(-118.85058330380885, otherSide.getQ(), ACCEPTABLE_THRESHOLD);
+    BOOST_CHECK_CLOSE(396.50418762074077, otherSide.getU(), ACCEPTABLE_THRESHOLD);
+    BOOST_CHECK_CLOSE(-1.7318099978500625, otherSide.getA(), ACCEPTABLE_THRESHOLD);
+}
+
+BOOST_AUTO_TEST_CASE(OtherSideY1Y2) {
+    Network network = powsybl::network::EurostagFactory::createTutorial1Network();
+    Line& line = network.getLine("NHV1_NHV2_1");
+    Terminal& terminal1 = line.getTerminal1();
+    Bus& bus1 = terminal1.getBusBreakerView().getBus().get();
+
+    terminal1.setP(302.44406127929688);
+    terminal1.setQ(98.740272521972656);
+    bus1.setV(402.14284515380859);
+    bus1.setAngle(0);
+    SV sv(terminal1.getP(), terminal1.getQ(), bus1.getV(), bus1.getAngle());
+
+    const SV& otherSide = sv.otherSideY1Y2(line);
+    BOOST_CHECK_CLOSE(-300.43390740755751, otherSide.getP(), ACCEPTABLE_THRESHOLD);
+    BOOST_CHECK_CLOSE(-137.18849721702034, otherSide.getQ(), ACCEPTABLE_THRESHOLD);
+    BOOST_CHECK_CLOSE(389.95267268210063, otherSide.getU(), ACCEPTABLE_THRESHOLD);
+    BOOST_CHECK_CLOSE(-3.5063579035161601, otherSide.getA(), ACCEPTABLE_THRESHOLD);
+}
+
+BOOST_AUTO_TEST_SUITE_END()
+
+}  // namespace iidm
+
+}  // namespace powsybl
diff --git a/test/resources/V1_0/tieline.xml b/test/resources/V1_0/tieline.xml
index 533e2fa7e..014a4a4d8 100644
--- a/test/resources/V1_0/tieline.xml
+++ b/test/resources/V1_0/tieline.xml
@@ -37,6 +37,6 @@
             </iidm:ratioTapChanger>
         </iidm:twoWindingsTransformer>
     </iidm:substation>
-    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="302.44406127929688" xnodeQ_1="98.740272521972656" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="-300.43389892578125" xnodeQ_2="-137.18849182128906"/>
-    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="302.44406127929688" xnodeQ_1="98.740272521972656" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="-300.43389892578125" xnodeQ_2="-137.18849182128906"/>
+    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380885" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518379" xnodeQ_2="118.76748245598358"/>
+    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380885" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518379" xnodeQ_2="118.76748245598358"/>
 </iidm:network>
diff --git a/test/resources/V1_0/tieline.xml.macos b/test/resources/V1_0/tieline.xml.macos
new file mode 100644
index 000000000..5c07e8171
--- /dev/null
+++ b/test/resources/V1_0/tieline.xml.macos
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.itesla_project.eu/schema/iidm/1_0" id="sim1" caseDate="2013-01-15T18:45:00+01:00" forecastDistance="0" sourceFormat="test">
+    <iidm:substation id="P1" country="FR" tso="RTE" geographicalTags="A">
+        <iidm:voltageLevel id="VLGEN" nominalV="24" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NGEN" v="24.500000610351563" angle="2.3259763717651367"/>
+            </iidm:busBreakerTopology>
+            <iidm:generator id="GEN" energySource="OTHER" minP="-9999.9899999999998" maxP="9999.9899999999998" voltageRegulatorOn="true" targetP="607" targetV="24.5" targetQ="301" bus="NGEN" connectableBus="NGEN" p="-605.558349609375" q="-225.28251647949219">
+                <iidm:minMaxReactiveLimits minQ="-9999.9899999999998" maxQ="9999.9899999999998"/>
+            </iidm:generator>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLHV1" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV1" v="402.14284515380859" angle="0"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NGEN_NHV1" r="0.26658461538461536" x="11.104492831516762" g="0" b="0" ratedU1="24" ratedU2="400" bus1="NGEN" connectableBus1="NGEN" voltageLevelId1="VLGEN" bus2="NHV1" connectableBus2="NHV1" voltageLevelId2="VLHV1" p1="605.558349609375" q1="225.28251647949219" p2="-604.89093017578125" q2="-197.48046875"/>
+    </iidm:substation>
+    <iidm:substation id="P2" country="FR" tso="RTE" geographicalTags="B">
+        <iidm:voltageLevel id="VLHV2" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV2" v="389.95267639160159" angle="-3.5063576698303223"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLLOAD" nominalV="150" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NLOAD" v="147.57861328125" angle="-9.6144866943359375"/>
+            </iidm:busBreakerTopology>
+            <iidm:load id="LOAD" loadType="UNDEFINED" p0="600" q0="200" bus="NLOAD" connectableBus="NLOAD" p="600" q="200"/>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NHV2_NLOAD" r="0.047249999999999993" x="4.0497243656204551" g="0" b="0" ratedU1="400" ratedU2="158" bus1="NHV2" connectableBus1="NHV2" voltageLevelId1="VLHV2" bus2="NLOAD" connectableBus2="NLOAD" voltageLevelId2="VLLOAD" p1="600.8677978515625" q1="274.37698364257" p2="-600" q2="-200">
+            <iidm:ratioTapChanger lowTapPosition="0" tapPosition="1" loadTapChangingCapabilities="true" regulating="true" targetV="158">
+                <iidm:terminalRef id="NHV2_NLOAD" side="TWO"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="0.85056669052441913"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.0006666666666666"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.1507666428089141"/>
+            </iidm:ratioTapChanger>
+        </iidm:twoWindingsTransformer>
+    </iidm:substation>
+    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380883" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518373" xnodeQ_2="118.76748245598357"/>
+    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380883" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518373" xnodeQ_2="118.76748245598357"/>
+</iidm:network>
diff --git a/test/resources/V1_0/tielineFictitious.xml b/test/resources/V1_0/tielineFictitious.xml
index 533e2fa7e..014a4a4d8 100644
--- a/test/resources/V1_0/tielineFictitious.xml
+++ b/test/resources/V1_0/tielineFictitious.xml
@@ -37,6 +37,6 @@
             </iidm:ratioTapChanger>
         </iidm:twoWindingsTransformer>
     </iidm:substation>
-    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="302.44406127929688" xnodeQ_1="98.740272521972656" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="-300.43389892578125" xnodeQ_2="-137.18849182128906"/>
-    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="302.44406127929688" xnodeQ_1="98.740272521972656" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="-300.43389892578125" xnodeQ_2="-137.18849182128906"/>
+    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380885" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518379" xnodeQ_2="118.76748245598358"/>
+    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380885" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518379" xnodeQ_2="118.76748245598358"/>
 </iidm:network>
diff --git a/test/resources/V1_0/tielineFictitious.xml.macos b/test/resources/V1_0/tielineFictitious.xml.macos
new file mode 100644
index 000000000..5c07e8171
--- /dev/null
+++ b/test/resources/V1_0/tielineFictitious.xml.macos
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.itesla_project.eu/schema/iidm/1_0" id="sim1" caseDate="2013-01-15T18:45:00+01:00" forecastDistance="0" sourceFormat="test">
+    <iidm:substation id="P1" country="FR" tso="RTE" geographicalTags="A">
+        <iidm:voltageLevel id="VLGEN" nominalV="24" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NGEN" v="24.500000610351563" angle="2.3259763717651367"/>
+            </iidm:busBreakerTopology>
+            <iidm:generator id="GEN" energySource="OTHER" minP="-9999.9899999999998" maxP="9999.9899999999998" voltageRegulatorOn="true" targetP="607" targetV="24.5" targetQ="301" bus="NGEN" connectableBus="NGEN" p="-605.558349609375" q="-225.28251647949219">
+                <iidm:minMaxReactiveLimits minQ="-9999.9899999999998" maxQ="9999.9899999999998"/>
+            </iidm:generator>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLHV1" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV1" v="402.14284515380859" angle="0"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NGEN_NHV1" r="0.26658461538461536" x="11.104492831516762" g="0" b="0" ratedU1="24" ratedU2="400" bus1="NGEN" connectableBus1="NGEN" voltageLevelId1="VLGEN" bus2="NHV1" connectableBus2="NHV1" voltageLevelId2="VLHV1" p1="605.558349609375" q1="225.28251647949219" p2="-604.89093017578125" q2="-197.48046875"/>
+    </iidm:substation>
+    <iidm:substation id="P2" country="FR" tso="RTE" geographicalTags="B">
+        <iidm:voltageLevel id="VLHV2" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV2" v="389.95267639160159" angle="-3.5063576698303223"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLLOAD" nominalV="150" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NLOAD" v="147.57861328125" angle="-9.6144866943359375"/>
+            </iidm:busBreakerTopology>
+            <iidm:load id="LOAD" loadType="UNDEFINED" p0="600" q0="200" bus="NLOAD" connectableBus="NLOAD" p="600" q="200"/>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NHV2_NLOAD" r="0.047249999999999993" x="4.0497243656204551" g="0" b="0" ratedU1="400" ratedU2="158" bus1="NHV2" connectableBus1="NHV2" voltageLevelId1="VLHV2" bus2="NLOAD" connectableBus2="NLOAD" voltageLevelId2="VLLOAD" p1="600.8677978515625" q1="274.37698364257" p2="-600" q2="-200">
+            <iidm:ratioTapChanger lowTapPosition="0" tapPosition="1" loadTapChangingCapabilities="true" regulating="true" targetV="158">
+                <iidm:terminalRef id="NHV2_NLOAD" side="TWO"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="0.85056669052441913"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.0006666666666666"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.1507666428089141"/>
+            </iidm:ratioTapChanger>
+        </iidm:twoWindingsTransformer>
+    </iidm:substation>
+    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380883" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518373" xnodeQ_2="118.76748245598357"/>
+    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380883" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518373" xnodeQ_2="118.76748245598357"/>
+</iidm:network>
diff --git a/test/resources/V1_1/tieline.xml b/test/resources/V1_1/tieline.xml
index f2d551ab1..ffb3240c7 100644
--- a/test/resources/V1_1/tieline.xml
+++ b/test/resources/V1_1/tieline.xml
@@ -37,6 +37,6 @@
             </iidm:ratioTapChanger>
         </iidm:twoWindingsTransformer>
     </iidm:substation>
-    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="302.44406127929688" xnodeQ_1="98.740272521972656" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="-300.43389892578125" xnodeQ_2="-137.18849182128906"/>
-    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="302.44406127929688" xnodeQ_1="98.740272521972656" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="-300.43389892578125" xnodeQ_2="-137.18849182128906"/>
+    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380885" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518379" xnodeQ_2="118.76748245598358"/>
+    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380885" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518379" xnodeQ_2="118.76748245598358"/>
 </iidm:network>
diff --git a/test/resources/V1_1/tieline.xml.macos b/test/resources/V1_1/tieline.xml.macos
new file mode 100644
index 000000000..0dd1b4454
--- /dev/null
+++ b/test/resources/V1_1/tieline.xml.macos
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_1" id="sim1" caseDate="2013-01-15T18:45:00+01:00" forecastDistance="0" sourceFormat="test">
+    <iidm:substation id="P1" country="FR" tso="RTE" geographicalTags="A">
+        <iidm:voltageLevel id="VLGEN" nominalV="24" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NGEN" v="24.500000610351563" angle="2.3259763717651367"/>
+            </iidm:busBreakerTopology>
+            <iidm:generator id="GEN" energySource="OTHER" minP="-9999.9899999999998" maxP="9999.9899999999998" voltageRegulatorOn="true" targetP="607" targetV="24.5" targetQ="301" bus="NGEN" connectableBus="NGEN" p="-605.558349609375" q="-225.28251647949219">
+                <iidm:minMaxReactiveLimits minQ="-9999.9899999999998" maxQ="9999.9899999999998"/>
+            </iidm:generator>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLHV1" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV1" v="402.14284515380859" angle="0"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NGEN_NHV1" r="0.26658461538461536" x="11.104492831516762" g="0" b="0" ratedU1="24" ratedU2="400" bus1="NGEN" connectableBus1="NGEN" voltageLevelId1="VLGEN" bus2="NHV1" connectableBus2="NHV1" voltageLevelId2="VLHV1" p1="605.558349609375" q1="225.28251647949219" p2="-604.89093017578125" q2="-197.48046875"/>
+    </iidm:substation>
+    <iidm:substation id="P2" country="FR" tso="RTE" geographicalTags="B">
+        <iidm:voltageLevel id="VLHV2" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV2" v="389.95267639160159" angle="-3.5063576698303223"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLLOAD" nominalV="150" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NLOAD" v="147.57861328125" angle="-9.6144866943359375"/>
+            </iidm:busBreakerTopology>
+            <iidm:load id="LOAD" loadType="UNDEFINED" p0="600" q0="200" bus="NLOAD" connectableBus="NLOAD" p="600" q="200"/>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NHV2_NLOAD" r="0.047249999999999993" x="4.0497243656204551" g="0" b="0" ratedU1="400" ratedU2="158" bus1="NHV2" connectableBus1="NHV2" voltageLevelId1="VLHV2" bus2="NLOAD" connectableBus2="NLOAD" voltageLevelId2="VLLOAD" p1="600.8677978515625" q1="274.37698364257" p2="-600" q2="-200">
+            <iidm:ratioTapChanger lowTapPosition="0" tapPosition="1" loadTapChangingCapabilities="true" regulating="true" targetV="158">
+                <iidm:terminalRef id="NHV2_NLOAD" side="TWO"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="0.85056669052441913"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.0006666666666666"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.1507666428089141"/>
+            </iidm:ratioTapChanger>
+        </iidm:twoWindingsTransformer>
+    </iidm:substation>
+    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380883" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518373" xnodeQ_2="118.76748245598357"/>
+    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380883" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518373" xnodeQ_2="118.76748245598357"/>
+</iidm:network>
diff --git a/test/resources/V1_1/tielineFictitious.xml b/test/resources/V1_1/tielineFictitious.xml
index f2d551ab1..ffb3240c7 100644
--- a/test/resources/V1_1/tielineFictitious.xml
+++ b/test/resources/V1_1/tielineFictitious.xml
@@ -37,6 +37,6 @@
             </iidm:ratioTapChanger>
         </iidm:twoWindingsTransformer>
     </iidm:substation>
-    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="302.44406127929688" xnodeQ_1="98.740272521972656" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="-300.43389892578125" xnodeQ_2="-137.18849182128906"/>
-    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="302.44406127929688" xnodeQ_1="98.740272521972656" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="-300.43389892578125" xnodeQ_2="-137.18849182128906"/>
+    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380885" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518379" xnodeQ_2="118.76748245598358"/>
+    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380885" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518379" xnodeQ_2="118.76748245598358"/>
 </iidm:network>
diff --git a/test/resources/V1_1/tielineFictitious.xml.macos b/test/resources/V1_1/tielineFictitious.xml.macos
new file mode 100644
index 000000000..0dd1b4454
--- /dev/null
+++ b/test/resources/V1_1/tielineFictitious.xml.macos
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_1" id="sim1" caseDate="2013-01-15T18:45:00+01:00" forecastDistance="0" sourceFormat="test">
+    <iidm:substation id="P1" country="FR" tso="RTE" geographicalTags="A">
+        <iidm:voltageLevel id="VLGEN" nominalV="24" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NGEN" v="24.500000610351563" angle="2.3259763717651367"/>
+            </iidm:busBreakerTopology>
+            <iidm:generator id="GEN" energySource="OTHER" minP="-9999.9899999999998" maxP="9999.9899999999998" voltageRegulatorOn="true" targetP="607" targetV="24.5" targetQ="301" bus="NGEN" connectableBus="NGEN" p="-605.558349609375" q="-225.28251647949219">
+                <iidm:minMaxReactiveLimits minQ="-9999.9899999999998" maxQ="9999.9899999999998"/>
+            </iidm:generator>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLHV1" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV1" v="402.14284515380859" angle="0"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NGEN_NHV1" r="0.26658461538461536" x="11.104492831516762" g="0" b="0" ratedU1="24" ratedU2="400" bus1="NGEN" connectableBus1="NGEN" voltageLevelId1="VLGEN" bus2="NHV1" connectableBus2="NHV1" voltageLevelId2="VLHV1" p1="605.558349609375" q1="225.28251647949219" p2="-604.89093017578125" q2="-197.48046875"/>
+    </iidm:substation>
+    <iidm:substation id="P2" country="FR" tso="RTE" geographicalTags="B">
+        <iidm:voltageLevel id="VLHV2" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV2" v="389.95267639160159" angle="-3.5063576698303223"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLLOAD" nominalV="150" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NLOAD" v="147.57861328125" angle="-9.6144866943359375"/>
+            </iidm:busBreakerTopology>
+            <iidm:load id="LOAD" loadType="UNDEFINED" p0="600" q0="200" bus="NLOAD" connectableBus="NLOAD" p="600" q="200"/>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NHV2_NLOAD" r="0.047249999999999993" x="4.0497243656204551" g="0" b="0" ratedU1="400" ratedU2="158" bus1="NHV2" connectableBus1="NHV2" voltageLevelId1="VLHV2" bus2="NLOAD" connectableBus2="NLOAD" voltageLevelId2="VLLOAD" p1="600.8677978515625" q1="274.37698364257" p2="-600" q2="-200">
+            <iidm:ratioTapChanger lowTapPosition="0" tapPosition="1" loadTapChangingCapabilities="true" regulating="true" targetV="158">
+                <iidm:terminalRef id="NHV2_NLOAD" side="TWO"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="0.85056669052441913"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.0006666666666666"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.1507666428089141"/>
+            </iidm:ratioTapChanger>
+        </iidm:twoWindingsTransformer>
+    </iidm:substation>
+    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380883" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518373" xnodeQ_2="118.76748245598357"/>
+    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380883" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518373" xnodeQ_2="118.76748245598357"/>
+</iidm:network>
diff --git a/test/resources/V1_2/tieline.xml b/test/resources/V1_2/tieline.xml
index 802588617..32f5620ba 100644
--- a/test/resources/V1_2/tieline.xml
+++ b/test/resources/V1_2/tieline.xml
@@ -37,6 +37,6 @@
             </iidm:ratioTapChanger>
         </iidm:twoWindingsTransformer>
     </iidm:substation>
-    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="302.44406127929688" xnodeQ_1="98.740272521972656" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="-300.43389892578125" xnodeQ_2="-137.18849182128906"/>
-    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="302.44406127929688" xnodeQ_1="98.740272521972656" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="-300.43389892578125" xnodeQ_2="-137.18849182128906"/>
+    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380885" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518379" xnodeQ_2="118.76748245598358"/>
+    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380885" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518379" xnodeQ_2="118.76748245598358"/>
 </iidm:network>
diff --git a/test/resources/V1_2/tieline.xml.macos b/test/resources/V1_2/tieline.xml.macos
new file mode 100644
index 000000000..6ff3f645e
--- /dev/null
+++ b/test/resources/V1_2/tieline.xml.macos
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_2" id="sim1" caseDate="2013-01-15T18:45:00+01:00" forecastDistance="0" sourceFormat="test">
+    <iidm:substation id="P1" country="FR" tso="RTE" geographicalTags="A">
+        <iidm:voltageLevel id="VLGEN" nominalV="24" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NGEN" v="24.500000610351563" angle="2.3259763717651367"/>
+            </iidm:busBreakerTopology>
+            <iidm:generator id="GEN" energySource="OTHER" minP="-9999.9899999999998" maxP="9999.9899999999998" voltageRegulatorOn="true" targetP="607" targetV="24.5" targetQ="301" bus="NGEN" connectableBus="NGEN" p="-605.558349609375" q="-225.28251647949219">
+                <iidm:minMaxReactiveLimits minQ="-9999.9899999999998" maxQ="9999.9899999999998"/>
+            </iidm:generator>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLHV1" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV1" v="402.14284515380859" angle="0"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NGEN_NHV1" r="0.26658461538461536" x="11.104492831516762" g="0" b="0" ratedU1="24" ratedU2="400" bus1="NGEN" connectableBus1="NGEN" voltageLevelId1="VLGEN" bus2="NHV1" connectableBus2="NHV1" voltageLevelId2="VLHV1" p1="605.558349609375" q1="225.28251647949219" p2="-604.89093017578125" q2="-197.48046875"/>
+    </iidm:substation>
+    <iidm:substation id="P2" country="FR" tso="RTE" geographicalTags="B">
+        <iidm:voltageLevel id="VLHV2" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV2" v="389.95267639160159" angle="-3.5063576698303223"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLLOAD" nominalV="150" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NLOAD" v="147.57861328125" angle="-9.6144866943359375"/>
+            </iidm:busBreakerTopology>
+            <iidm:load id="LOAD" loadType="UNDEFINED" p0="600" q0="200" bus="NLOAD" connectableBus="NLOAD" p="600" q="200"/>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NHV2_NLOAD" r="0.047249999999999993" x="4.0497243656204551" g="0" b="0" ratedU1="400" ratedU2="158" bus1="NHV2" connectableBus1="NHV2" voltageLevelId1="VLHV2" bus2="NLOAD" connectableBus2="NLOAD" voltageLevelId2="VLLOAD" p1="600.8677978515625" q1="274.37698364257" p2="-600" q2="-200">
+            <iidm:ratioTapChanger lowTapPosition="0" tapPosition="1" targetDeadband="0" loadTapChangingCapabilities="true" regulating="true" targetV="158">
+                <iidm:terminalRef id="NHV2_NLOAD" side="TWO"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="0.85056669052441913"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.0006666666666666"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.1507666428089141"/>
+            </iidm:ratioTapChanger>
+        </iidm:twoWindingsTransformer>
+    </iidm:substation>
+    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380883" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518373" xnodeQ_2="118.76748245598357"/>
+    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380883" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518373" xnodeQ_2="118.76748245598357"/>
+</iidm:network>
diff --git a/test/resources/V1_2/tielineFictitious.xml b/test/resources/V1_2/tielineFictitious.xml
index 802588617..32f5620ba 100644
--- a/test/resources/V1_2/tielineFictitious.xml
+++ b/test/resources/V1_2/tielineFictitious.xml
@@ -37,6 +37,6 @@
             </iidm:ratioTapChanger>
         </iidm:twoWindingsTransformer>
     </iidm:substation>
-    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="302.44406127929688" xnodeQ_1="98.740272521972656" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="-300.43389892578125" xnodeQ_2="-137.18849182128906"/>
-    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="302.44406127929688" xnodeQ_1="98.740272521972656" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="-300.43389892578125" xnodeQ_2="-137.18849182128906"/>
+    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380885" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518379" xnodeQ_2="118.76748245598358"/>
+    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380885" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518379" xnodeQ_2="118.76748245598358"/>
 </iidm:network>
diff --git a/test/resources/V1_2/tielineFictitious.xml.macos b/test/resources/V1_2/tielineFictitious.xml.macos
new file mode 100644
index 000000000..6ff3f645e
--- /dev/null
+++ b/test/resources/V1_2/tielineFictitious.xml.macos
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_2" id="sim1" caseDate="2013-01-15T18:45:00+01:00" forecastDistance="0" sourceFormat="test">
+    <iidm:substation id="P1" country="FR" tso="RTE" geographicalTags="A">
+        <iidm:voltageLevel id="VLGEN" nominalV="24" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NGEN" v="24.500000610351563" angle="2.3259763717651367"/>
+            </iidm:busBreakerTopology>
+            <iidm:generator id="GEN" energySource="OTHER" minP="-9999.9899999999998" maxP="9999.9899999999998" voltageRegulatorOn="true" targetP="607" targetV="24.5" targetQ="301" bus="NGEN" connectableBus="NGEN" p="-605.558349609375" q="-225.28251647949219">
+                <iidm:minMaxReactiveLimits minQ="-9999.9899999999998" maxQ="9999.9899999999998"/>
+            </iidm:generator>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLHV1" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV1" v="402.14284515380859" angle="0"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NGEN_NHV1" r="0.26658461538461536" x="11.104492831516762" g="0" b="0" ratedU1="24" ratedU2="400" bus1="NGEN" connectableBus1="NGEN" voltageLevelId1="VLGEN" bus2="NHV1" connectableBus2="NHV1" voltageLevelId2="VLHV1" p1="605.558349609375" q1="225.28251647949219" p2="-604.89093017578125" q2="-197.48046875"/>
+    </iidm:substation>
+    <iidm:substation id="P2" country="FR" tso="RTE" geographicalTags="B">
+        <iidm:voltageLevel id="VLHV2" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV2" v="389.95267639160159" angle="-3.5063576698303223"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLLOAD" nominalV="150" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NLOAD" v="147.57861328125" angle="-9.6144866943359375"/>
+            </iidm:busBreakerTopology>
+            <iidm:load id="LOAD" loadType="UNDEFINED" p0="600" q0="200" bus="NLOAD" connectableBus="NLOAD" p="600" q="200"/>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NHV2_NLOAD" r="0.047249999999999993" x="4.0497243656204551" g="0" b="0" ratedU1="400" ratedU2="158" bus1="NHV2" connectableBus1="NHV2" voltageLevelId1="VLHV2" bus2="NLOAD" connectableBus2="NLOAD" voltageLevelId2="VLLOAD" p1="600.8677978515625" q1="274.37698364257" p2="-600" q2="-200">
+            <iidm:ratioTapChanger lowTapPosition="0" tapPosition="1" targetDeadband="0" loadTapChangingCapabilities="true" regulating="true" targetV="158">
+                <iidm:terminalRef id="NHV2_NLOAD" side="TWO"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="0.85056669052441913"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.0006666666666666"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.1507666428089141"/>
+            </iidm:ratioTapChanger>
+        </iidm:twoWindingsTransformer>
+    </iidm:substation>
+    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380883" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518373" xnodeQ_2="118.76748245598357"/>
+    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380883" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518373" xnodeQ_2="118.76748245598357"/>
+</iidm:network>
diff --git a/test/resources/V1_3/tieline.xml b/test/resources/V1_3/tieline.xml
index 79fb53e8c..28975d99c 100644
--- a/test/resources/V1_3/tieline.xml
+++ b/test/resources/V1_3/tieline.xml
@@ -37,6 +37,6 @@
             </iidm:ratioTapChanger>
         </iidm:twoWindingsTransformer>
     </iidm:substation>
-    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="302.44406127929688" xnodeQ_1="98.740272521972656" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="-300.43389892578125" xnodeQ_2="-137.18849182128906"/>
-    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="302.44406127929688" xnodeQ_1="98.740272521972656" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="-300.43389892578125" xnodeQ_2="-137.18849182128906"/>
+    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380885" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518379" xnodeQ_2="118.76748245598358"/>
+    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380885" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518379" xnodeQ_2="118.76748245598358"/>
 </iidm:network>
diff --git a/test/resources/V1_3/tieline.xml.macos b/test/resources/V1_3/tieline.xml.macos
new file mode 100644
index 000000000..c33f21b93
--- /dev/null
+++ b/test/resources/V1_3/tieline.xml.macos
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_3" id="sim1" caseDate="2013-01-15T18:45:00+01:00" forecastDistance="0" sourceFormat="test">
+    <iidm:substation id="P1" country="FR" tso="RTE" geographicalTags="A">
+        <iidm:voltageLevel id="VLGEN" nominalV="24" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NGEN" v="24.500000610351563" angle="2.3259763717651367"/>
+            </iidm:busBreakerTopology>
+            <iidm:generator id="GEN" energySource="OTHER" minP="-9999.9899999999998" maxP="9999.9899999999998" voltageRegulatorOn="true" targetP="607" targetV="24.5" targetQ="301" bus="NGEN" connectableBus="NGEN" p="-605.558349609375" q="-225.28251647949219">
+                <iidm:minMaxReactiveLimits minQ="-9999.9899999999998" maxQ="9999.9899999999998"/>
+            </iidm:generator>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLHV1" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV1" v="402.14284515380859" angle="0"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NGEN_NHV1" r="0.26658461538461536" x="11.104492831516762" g="0" b="0" ratedU1="24" ratedU2="400" bus1="NGEN" connectableBus1="NGEN" voltageLevelId1="VLGEN" bus2="NHV1" connectableBus2="NHV1" voltageLevelId2="VLHV1" p1="605.558349609375" q1="225.28251647949219" p2="-604.89093017578125" q2="-197.48046875"/>
+    </iidm:substation>
+    <iidm:substation id="P2" country="FR" tso="RTE" geographicalTags="B">
+        <iidm:voltageLevel id="VLHV2" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV2" v="389.95267639160159" angle="-3.5063576698303223"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLLOAD" nominalV="150" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NLOAD" v="147.57861328125" angle="-9.6144866943359375"/>
+            </iidm:busBreakerTopology>
+            <iidm:load id="LOAD" loadType="UNDEFINED" p0="600" q0="200" bus="NLOAD" connectableBus="NLOAD" p="600" q="200"/>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NHV2_NLOAD" r="0.047249999999999993" x="4.0497243656204551" g="0" b="0" ratedU1="400" ratedU2="158" bus1="NHV2" connectableBus1="NHV2" voltageLevelId1="VLHV2" bus2="NLOAD" connectableBus2="NLOAD" voltageLevelId2="VLLOAD" p1="600.8677978515625" q1="274.37698364257" p2="-600" q2="-200">
+            <iidm:ratioTapChanger lowTapPosition="0" tapPosition="1" targetDeadband="0" loadTapChangingCapabilities="true" regulating="true" targetV="158">
+                <iidm:terminalRef id="NHV2_NLOAD" side="TWO"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="0.85056669052441913"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.0006666666666666"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.1507666428089141"/>
+            </iidm:ratioTapChanger>
+        </iidm:twoWindingsTransformer>
+    </iidm:substation>
+    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380883" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518373" xnodeQ_2="118.76748245598357"/>
+    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380883" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518373" xnodeQ_2="118.76748245598357"/>
+</iidm:network>
diff --git a/test/resources/V1_3/tielineFictitious.xml b/test/resources/V1_3/tielineFictitious.xml
index eb4ab0623..392fe44ea 100644
--- a/test/resources/V1_3/tielineFictitious.xml
+++ b/test/resources/V1_3/tielineFictitious.xml
@@ -37,6 +37,6 @@
             </iidm:ratioTapChanger>
         </iidm:twoWindingsTransformer>
     </iidm:substation>
-    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="302.44406127929688" xnodeQ_1="98.740272521972656" fictitious_1="true" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="-300.43389892578125" xnodeQ_2="-137.18849182128906"/>
-    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="302.44406127929688" xnodeQ_1="98.740272521972656" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="-300.43389892578125" xnodeQ_2="-137.18849182128906" fictitious_2="true"/>
+    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380885" fictitious_1="true" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518379" xnodeQ_2="118.76748245598358"/>
+    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380885" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518379" xnodeQ_2="118.76748245598358" fictitious_2="true"/>
 </iidm:network>
diff --git a/test/resources/V1_3/tielineFictitious.xml.macos b/test/resources/V1_3/tielineFictitious.xml.macos
new file mode 100644
index 000000000..c33f21b93
--- /dev/null
+++ b/test/resources/V1_3/tielineFictitious.xml.macos
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_3" id="sim1" caseDate="2013-01-15T18:45:00+01:00" forecastDistance="0" sourceFormat="test">
+    <iidm:substation id="P1" country="FR" tso="RTE" geographicalTags="A">
+        <iidm:voltageLevel id="VLGEN" nominalV="24" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NGEN" v="24.500000610351563" angle="2.3259763717651367"/>
+            </iidm:busBreakerTopology>
+            <iidm:generator id="GEN" energySource="OTHER" minP="-9999.9899999999998" maxP="9999.9899999999998" voltageRegulatorOn="true" targetP="607" targetV="24.5" targetQ="301" bus="NGEN" connectableBus="NGEN" p="-605.558349609375" q="-225.28251647949219">
+                <iidm:minMaxReactiveLimits minQ="-9999.9899999999998" maxQ="9999.9899999999998"/>
+            </iidm:generator>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLHV1" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV1" v="402.14284515380859" angle="0"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NGEN_NHV1" r="0.26658461538461536" x="11.104492831516762" g="0" b="0" ratedU1="24" ratedU2="400" bus1="NGEN" connectableBus1="NGEN" voltageLevelId1="VLGEN" bus2="NHV1" connectableBus2="NHV1" voltageLevelId2="VLHV1" p1="605.558349609375" q1="225.28251647949219" p2="-604.89093017578125" q2="-197.48046875"/>
+    </iidm:substation>
+    <iidm:substation id="P2" country="FR" tso="RTE" geographicalTags="B">
+        <iidm:voltageLevel id="VLHV2" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV2" v="389.95267639160159" angle="-3.5063576698303223"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLLOAD" nominalV="150" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NLOAD" v="147.57861328125" angle="-9.6144866943359375"/>
+            </iidm:busBreakerTopology>
+            <iidm:load id="LOAD" loadType="UNDEFINED" p0="600" q0="200" bus="NLOAD" connectableBus="NLOAD" p="600" q="200"/>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NHV2_NLOAD" r="0.047249999999999993" x="4.0497243656204551" g="0" b="0" ratedU1="400" ratedU2="158" bus1="NHV2" connectableBus1="NHV2" voltageLevelId1="VLHV2" bus2="NLOAD" connectableBus2="NLOAD" voltageLevelId2="VLLOAD" p1="600.8677978515625" q1="274.37698364257" p2="-600" q2="-200">
+            <iidm:ratioTapChanger lowTapPosition="0" tapPosition="1" targetDeadband="0" loadTapChangingCapabilities="true" regulating="true" targetV="158">
+                <iidm:terminalRef id="NHV2_NLOAD" side="TWO"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="0.85056669052441913"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.0006666666666666"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.1507666428089141"/>
+            </iidm:ratioTapChanger>
+        </iidm:twoWindingsTransformer>
+    </iidm:substation>
+    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380883" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518373" xnodeQ_2="118.76748245598357"/>
+    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380883" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518373" xnodeQ_2="118.76748245598357"/>
+</iidm:network>
diff --git a/test/resources/V1_3/tielineWithAliases.xml b/test/resources/V1_3/tielineWithAliases.xml
index 2706af7f4..bc5ad225d 100644
--- a/test/resources/V1_3/tielineWithAliases.xml
+++ b/test/resources/V1_3/tielineWithAliases.xml
@@ -37,9 +37,9 @@
             </iidm:ratioTapChanger>
         </iidm:twoWindingsTransformer>
     </iidm:substation>
-    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="302.44406127929688" xnodeQ_1="98.740272521972656" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="-300.43389892578125" xnodeQ_2="-137.18849182128906">
+    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380885" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518379" xnodeQ_2="118.76748245598358">
         <iidm:alias>Alias</iidm:alias>
         <iidm:alias>Other alias</iidm:alias>
     </iidm:tieLine>
-    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="302.44406127929688" xnodeQ_1="98.740272521972656" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="-300.43389892578125" xnodeQ_2="-137.18849182128906"/>
+    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380885" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518379" xnodeQ_2="118.76748245598358"/>
 </iidm:network>
diff --git a/test/resources/V1_3/tielineWithAliases.xml.macos b/test/resources/V1_3/tielineWithAliases.xml.macos
new file mode 100644
index 000000000..3c0232a45
--- /dev/null
+++ b/test/resources/V1_3/tielineWithAliases.xml.macos
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_3" id="sim1" caseDate="2013-01-15T18:45:00+01:00" forecastDistance="0" sourceFormat="test">
+    <iidm:substation id="P1" country="FR" tso="RTE" geographicalTags="A">
+        <iidm:voltageLevel id="VLGEN" nominalV="24" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NGEN" v="24.500000610351563" angle="2.3259763717651367"/>
+            </iidm:busBreakerTopology>
+            <iidm:generator id="GEN" energySource="OTHER" minP="-9999.9899999999998" maxP="9999.9899999999998" voltageRegulatorOn="true" targetP="607" targetV="24.5" targetQ="301" bus="NGEN" connectableBus="NGEN" p="-605.558349609375" q="-225.28251647949219">
+                <iidm:minMaxReactiveLimits minQ="-9999.9899999999998" maxQ="9999.9899999999998"/>
+            </iidm:generator>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLHV1" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV1" v="402.14284515380859" angle="0"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NGEN_NHV1" r="0.26658461538461536" x="11.104492831516762" g="0" b="0" ratedU1="24" ratedU2="400" bus1="NGEN" connectableBus1="NGEN" voltageLevelId1="VLGEN" bus2="NHV1" connectableBus2="NHV1" voltageLevelId2="VLHV1" p1="605.558349609375" q1="225.28251647949219" p2="-604.89093017578125" q2="-197.48046875"/>
+    </iidm:substation>
+    <iidm:substation id="P2" country="FR" tso="RTE" geographicalTags="B">
+        <iidm:voltageLevel id="VLHV2" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV2" v="389.95267639160159" angle="-3.5063576698303223"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLLOAD" nominalV="150" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NLOAD" v="147.57861328125" angle="-9.6144866943359375"/>
+            </iidm:busBreakerTopology>
+            <iidm:load id="LOAD" loadType="UNDEFINED" p0="600" q0="200" bus="NLOAD" connectableBus="NLOAD" p="600" q="200"/>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NHV2_NLOAD" r="0.047249999999999993" x="4.0497243656204551" g="0" b="0" ratedU1="400" ratedU2="158" bus1="NHV2" connectableBus1="NHV2" voltageLevelId1="VLHV2" bus2="NLOAD" connectableBus2="NLOAD" voltageLevelId2="VLLOAD" p1="600.8677978515625" q1="274.37698364257" p2="-600" q2="-200">
+            <iidm:ratioTapChanger lowTapPosition="0" tapPosition="1" targetDeadband="0" loadTapChangingCapabilities="true" regulating="true" targetV="158">
+                <iidm:terminalRef id="NHV2_NLOAD" side="TWO"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="0.85056669052441913"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.0006666666666666"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.1507666428089141"/>
+            </iidm:ratioTapChanger>
+        </iidm:twoWindingsTransformer>
+    </iidm:substation>
+    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380883" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518373" xnodeQ_2="118.76748245598357">
+        <iidm:alias>Alias</iidm:alias>
+        <iidm:alias>Other alias</iidm:alias>
+    </iidm:tieLine>
+    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380883" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518373" xnodeQ_2="118.76748245598357"/>
+</iidm:network>
diff --git a/test/resources/V1_4/tieline.xml b/test/resources/V1_4/tieline.xml
index 8f963a697..f9a80a5db 100644
--- a/test/resources/V1_4/tieline.xml
+++ b/test/resources/V1_4/tieline.xml
@@ -37,6 +37,6 @@
             </iidm:ratioTapChanger>
         </iidm:twoWindingsTransformer>
     </iidm:substation>
-    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="302.44406127929688" xnodeQ_1="98.740272521972656" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="-300.43389892578125" xnodeQ_2="-137.18849182128906"/>
-    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="302.44406127929688" xnodeQ_1="98.740272521972656" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="-300.43389892578125" xnodeQ_2="-137.18849182128906"/>
+    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380885" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518379" xnodeQ_2="118.76748245598358"/>
+    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380885" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518379" xnodeQ_2="118.76748245598358"/>
 </iidm:network>
diff --git a/test/resources/V1_4/tieline.xml.macos b/test/resources/V1_4/tieline.xml.macos
new file mode 100644
index 000000000..d3b49b730
--- /dev/null
+++ b/test/resources/V1_4/tieline.xml.macos
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_4" id="sim1" caseDate="2013-01-15T18:45:00+01:00" forecastDistance="0" sourceFormat="test">
+    <iidm:substation id="P1" country="FR" tso="RTE" geographicalTags="A">
+        <iidm:voltageLevel id="VLGEN" nominalV="24" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NGEN" v="24.500000610351563" angle="2.3259763717651367"/>
+            </iidm:busBreakerTopology>
+            <iidm:generator id="GEN" energySource="OTHER" minP="-9999.9899999999998" maxP="9999.9899999999998" voltageRegulatorOn="true" targetP="607" targetV="24.5" targetQ="301" bus="NGEN" connectableBus="NGEN" p="-605.558349609375" q="-225.28251647949219">
+                <iidm:minMaxReactiveLimits minQ="-9999.9899999999998" maxQ="9999.9899999999998"/>
+            </iidm:generator>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLHV1" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV1" v="402.14284515380859" angle="0"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NGEN_NHV1" r="0.26658461538461536" x="11.104492831516762" g="0" b="0" ratedU1="24" ratedU2="400" bus1="NGEN" connectableBus1="NGEN" voltageLevelId1="VLGEN" bus2="NHV1" connectableBus2="NHV1" voltageLevelId2="VLHV1" p1="605.558349609375" q1="225.28251647949219" p2="-604.89093017578125" q2="-197.48046875"/>
+    </iidm:substation>
+    <iidm:substation id="P2" country="FR" tso="RTE" geographicalTags="B">
+        <iidm:voltageLevel id="VLHV2" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV2" v="389.95267639160159" angle="-3.5063576698303223"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLLOAD" nominalV="150" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NLOAD" v="147.57861328125" angle="-9.6144866943359375"/>
+            </iidm:busBreakerTopology>
+            <iidm:load id="LOAD" loadType="UNDEFINED" p0="600" q0="200" bus="NLOAD" connectableBus="NLOAD" p="600" q="200"/>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NHV2_NLOAD" r="0.047249999999999993" x="4.0497243656204551" g="0" b="0" ratedU1="400" ratedU2="158" bus1="NHV2" connectableBus1="NHV2" voltageLevelId1="VLHV2" bus2="NLOAD" connectableBus2="NLOAD" voltageLevelId2="VLLOAD" p1="600.8677978515625" q1="274.37698364257" p2="-600" q2="-200">
+            <iidm:ratioTapChanger lowTapPosition="0" tapPosition="1" targetDeadband="0" loadTapChangingCapabilities="true" regulating="true" targetV="158">
+                <iidm:terminalRef id="NHV2_NLOAD" side="TWO"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="0.85056669052441913"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.0006666666666666"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.1507666428089141"/>
+            </iidm:ratioTapChanger>
+        </iidm:twoWindingsTransformer>
+    </iidm:substation>
+    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380883" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518373" xnodeQ_2="118.76748245598357"/>
+    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380883" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518373" xnodeQ_2="118.76748245598357"/>
+</iidm:network>
diff --git a/test/resources/V1_4/tielineFictitious.xml b/test/resources/V1_4/tielineFictitious.xml
index e04ea41ca..479427b48 100644
--- a/test/resources/V1_4/tielineFictitious.xml
+++ b/test/resources/V1_4/tielineFictitious.xml
@@ -37,6 +37,6 @@
             </iidm:ratioTapChanger>
         </iidm:twoWindingsTransformer>
     </iidm:substation>
-    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="302.44406127929688" xnodeQ_1="98.740272521972656" fictitious_1="true" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="-300.43389892578125" xnodeQ_2="-137.18849182128906"/>
-    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="302.44406127929688" xnodeQ_1="98.740272521972656" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="-300.43389892578125" xnodeQ_2="-137.18849182128906" fictitious_2="true"/>
+    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380885" fictitious_1="true" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518379" xnodeQ_2="118.76748245598358"/>
+    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380885" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518379" xnodeQ_2="118.76748245598358" fictitious_2="true"/>
 </iidm:network>
diff --git a/test/resources/V1_4/tielineFictitious.xml.macos b/test/resources/V1_4/tielineFictitious.xml.macos
new file mode 100644
index 000000000..d3b49b730
--- /dev/null
+++ b/test/resources/V1_4/tielineFictitious.xml.macos
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_4" id="sim1" caseDate="2013-01-15T18:45:00+01:00" forecastDistance="0" sourceFormat="test">
+    <iidm:substation id="P1" country="FR" tso="RTE" geographicalTags="A">
+        <iidm:voltageLevel id="VLGEN" nominalV="24" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NGEN" v="24.500000610351563" angle="2.3259763717651367"/>
+            </iidm:busBreakerTopology>
+            <iidm:generator id="GEN" energySource="OTHER" minP="-9999.9899999999998" maxP="9999.9899999999998" voltageRegulatorOn="true" targetP="607" targetV="24.5" targetQ="301" bus="NGEN" connectableBus="NGEN" p="-605.558349609375" q="-225.28251647949219">
+                <iidm:minMaxReactiveLimits minQ="-9999.9899999999998" maxQ="9999.9899999999998"/>
+            </iidm:generator>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLHV1" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV1" v="402.14284515380859" angle="0"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NGEN_NHV1" r="0.26658461538461536" x="11.104492831516762" g="0" b="0" ratedU1="24" ratedU2="400" bus1="NGEN" connectableBus1="NGEN" voltageLevelId1="VLGEN" bus2="NHV1" connectableBus2="NHV1" voltageLevelId2="VLHV1" p1="605.558349609375" q1="225.28251647949219" p2="-604.89093017578125" q2="-197.48046875"/>
+    </iidm:substation>
+    <iidm:substation id="P2" country="FR" tso="RTE" geographicalTags="B">
+        <iidm:voltageLevel id="VLHV2" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV2" v="389.95267639160159" angle="-3.5063576698303223"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLLOAD" nominalV="150" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NLOAD" v="147.57861328125" angle="-9.6144866943359375"/>
+            </iidm:busBreakerTopology>
+            <iidm:load id="LOAD" loadType="UNDEFINED" p0="600" q0="200" bus="NLOAD" connectableBus="NLOAD" p="600" q="200"/>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NHV2_NLOAD" r="0.047249999999999993" x="4.0497243656204551" g="0" b="0" ratedU1="400" ratedU2="158" bus1="NHV2" connectableBus1="NHV2" voltageLevelId1="VLHV2" bus2="NLOAD" connectableBus2="NLOAD" voltageLevelId2="VLLOAD" p1="600.8677978515625" q1="274.37698364257" p2="-600" q2="-200">
+            <iidm:ratioTapChanger lowTapPosition="0" tapPosition="1" targetDeadband="0" loadTapChangingCapabilities="true" regulating="true" targetV="158">
+                <iidm:terminalRef id="NHV2_NLOAD" side="TWO"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="0.85056669052441913"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.0006666666666666"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.1507666428089141"/>
+            </iidm:ratioTapChanger>
+        </iidm:twoWindingsTransformer>
+    </iidm:substation>
+    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380883" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518373" xnodeQ_2="118.76748245598357"/>
+    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380883" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518373" xnodeQ_2="118.76748245598357"/>
+</iidm:network>
diff --git a/test/resources/V1_4/tielineWithAliases.xml b/test/resources/V1_4/tielineWithAliases.xml
index beb4ca27e..a84f362a6 100644
--- a/test/resources/V1_4/tielineWithAliases.xml
+++ b/test/resources/V1_4/tielineWithAliases.xml
@@ -37,9 +37,9 @@
             </iidm:ratioTapChanger>
         </iidm:twoWindingsTransformer>
     </iidm:substation>
-    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="302.44406127929688" xnodeQ_1="98.740272521972656" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="-300.43389892578125" xnodeQ_2="-137.18849182128906">
+    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380885" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518379" xnodeQ_2="118.76748245598358">
         <iidm:alias>Alias</iidm:alias>
         <iidm:alias>Other alias</iidm:alias>
     </iidm:tieLine>
-    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="302.44406127929688" xnodeQ_1="98.740272521972656" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="-300.43389892578125" xnodeQ_2="-137.18849182128906"/>
+    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380885" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518379" xnodeQ_2="118.76748245598358"/>
 </iidm:network>
diff --git a/test/resources/V1_4/tielineWithAliases.xml.macos b/test/resources/V1_4/tielineWithAliases.xml.macos
new file mode 100644
index 000000000..0d0820b57
--- /dev/null
+++ b/test/resources/V1_4/tielineWithAliases.xml.macos
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_4" id="sim1" caseDate="2013-01-15T18:45:00+01:00" forecastDistance="0" sourceFormat="test">
+    <iidm:substation id="P1" country="FR" tso="RTE" geographicalTags="A">
+        <iidm:voltageLevel id="VLGEN" nominalV="24" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NGEN" v="24.500000610351563" angle="2.3259763717651367"/>
+            </iidm:busBreakerTopology>
+            <iidm:generator id="GEN" energySource="OTHER" minP="-9999.9899999999998" maxP="9999.9899999999998" voltageRegulatorOn="true" targetP="607" targetV="24.5" targetQ="301" bus="NGEN" connectableBus="NGEN" p="-605.558349609375" q="-225.28251647949219">
+                <iidm:minMaxReactiveLimits minQ="-9999.9899999999998" maxQ="9999.9899999999998"/>
+            </iidm:generator>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLHV1" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV1" v="402.14284515380859" angle="0"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NGEN_NHV1" r="0.26658461538461536" x="11.104492831516762" g="0" b="0" ratedU1="24" ratedU2="400" bus1="NGEN" connectableBus1="NGEN" voltageLevelId1="VLGEN" bus2="NHV1" connectableBus2="NHV1" voltageLevelId2="VLHV1" p1="605.558349609375" q1="225.28251647949219" p2="-604.89093017578125" q2="-197.48046875"/>
+    </iidm:substation>
+    <iidm:substation id="P2" country="FR" tso="RTE" geographicalTags="B">
+        <iidm:voltageLevel id="VLHV2" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV2" v="389.95267639160159" angle="-3.5063576698303223"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLLOAD" nominalV="150" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NLOAD" v="147.57861328125" angle="-9.6144866943359375"/>
+            </iidm:busBreakerTopology>
+            <iidm:load id="LOAD" loadType="UNDEFINED" p0="600" q0="200" bus="NLOAD" connectableBus="NLOAD" p="600" q="200"/>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NHV2_NLOAD" r="0.047249999999999993" x="4.0497243656204551" g="0" b="0" ratedU1="400" ratedU2="158" bus1="NHV2" connectableBus1="NHV2" voltageLevelId1="VLHV2" bus2="NLOAD" connectableBus2="NLOAD" voltageLevelId2="VLLOAD" p1="600.8677978515625" q1="274.37698364257" p2="-600" q2="-200">
+            <iidm:ratioTapChanger lowTapPosition="0" tapPosition="1" targetDeadband="0" loadTapChangingCapabilities="true" regulating="true" targetV="158">
+                <iidm:terminalRef id="NHV2_NLOAD" side="TWO"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="0.85056669052441913"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.0006666666666666"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.1507666428089141"/>
+            </iidm:ratioTapChanger>
+        </iidm:twoWindingsTransformer>
+    </iidm:substation>
+    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380883" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518373" xnodeQ_2="118.76748245598357">
+        <iidm:alias>Alias</iidm:alias>
+        <iidm:alias>Other alias</iidm:alias>
+    </iidm:tieLine>
+    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169686" xnodeQ_1="-118.85058330380883" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518373" xnodeQ_2="118.76748245598357"/>
+</iidm:network>
diff --git a/test/resources/V1_5/LccRoundTripRef.xml b/test/resources/V1_5/LccRoundTripRef.xml
new file mode 100644
index 000000000..8242bcd5f
--- /dev/null
+++ b/test/resources/V1_5/LccRoundTripRef.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" id="hvdctest" caseDate="2016-06-27T16:34:55.930000+02:00" forecastDistance="0" sourceFormat="test">
+    <iidm:substation id="S1" country="FR">
+        <iidm:voltageLevel id="VL1" nominalV="400" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="B1"/>
+            </iidm:busBreakerTopology>
+            <iidm:shunt id="C1_Filter1" name="Filter 1" sectionCount="1" voltageRegulatorOn="false" bus="B1" connectableBus="B1" q="25">
+                <iidm:shuntLinearModel bPerSection="1.0000000000000001e-05" maximumSectionCount="1"/>
+            </iidm:shunt>
+            <iidm:shunt id="C1_Filter2" name="Filter 2" sectionCount="0" voltageRegulatorOn="false" connectableBus="B1" q="25">
+                <iidm:shuntLinearModel bPerSection="2.0000000000000002e-05" maximumSectionCount="1"/>
+            </iidm:shunt>
+            <iidm:lccConverterStation id="C1" name="Converter1" lossFactor="1.1000000000000001" powerFactor="0.5" bus="B1" connectableBus="B1" p="100" q="50"/>
+        </iidm:voltageLevel>
+    </iidm:substation>
+    <iidm:substation id="S2" country="FR">
+        <iidm:voltageLevel id="VL2" nominalV="400" topologyKind="NODE_BREAKER">
+            <iidm:nodeBreakerTopology>
+                <iidm:busbarSection id="BBS1" name="BusbarSection" node="0"/>
+                <iidm:switch id="DISC_BBS1_BK1" name="Disconnector" kind="DISCONNECTOR" retained="false" open="false" node1="0" node2="1"/>
+                <iidm:switch id="BK1" name="Breaker" kind="BREAKER" retained="true" open="false" node1="1" node2="2"/>
+                <iidm:switch id="DISC_BBS1_BK2" name="Disconnector" kind="DISCONNECTOR" retained="false" open="false" node1="0" node2="3"/>
+                <iidm:switch id="BK2" name="Breaker" kind="BREAKER" retained="true" open="false" node1="3" node2="4"/>
+                <iidm:switch id="DISC_BBS1_BK3" name="Disconnector" kind="DISCONNECTOR" retained="false" open="false" node1="0" node2="5"/>
+                <iidm:switch id="BK3" name="Breaker" kind="BREAKER" retained="true" open="false" node1="5" node2="6"/>
+            </iidm:nodeBreakerTopology>
+            <iidm:shunt id="C2_Filter1" name="Filter 3" sectionCount="1" voltageRegulatorOn="false" node="4" q="12.5">
+                <iidm:shuntLinearModel bPerSection="3.0000000000000001e-05" maximumSectionCount="1"/>
+            </iidm:shunt>
+            <iidm:shunt id="C2_Filter2" name="Filter 4" sectionCount="1" voltageRegulatorOn="false" node="6" q="12.5">
+                <iidm:shuntLinearModel bPerSection="4.0000000000000003e-05" maximumSectionCount="1"/>
+            </iidm:shunt>
+            <iidm:lccConverterStation id="C2" name="Converter2" lossFactor="1.1000000000000001" powerFactor="0.59999999999999998" node="2" p="75" q="25"/>
+        </iidm:voltageLevel>
+    </iidm:substation>
+    <iidm:hvdcLine id="L" name="HVDC" r="1" nominalV="400" convertersMode="SIDE_1_INVERTER_SIDE_2_RECTIFIER" activePowerSetpoint="280" maxP="300" converterStation1="C1" converterStation2="C2"/>
+</iidm:network>
diff --git a/test/resources/V1_5/VscRoundTripRef.xml b/test/resources/V1_5/VscRoundTripRef.xml
new file mode 100644
index 000000000..d2fca89d7
--- /dev/null
+++ b/test/resources/V1_5/VscRoundTripRef.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" id="hvdctest" caseDate="2016-06-27T16:34:55.930000+02:00" forecastDistance="0" sourceFormat="test">
+    <iidm:substation id="S1" country="FR">
+        <iidm:voltageLevel id="VL1" nominalV="400" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="B1"/>
+            </iidm:busBreakerTopology>
+            <iidm:vscConverterStation id="C1" name="Converter1" voltageRegulatorOn="true" lossFactor="1.1000000000000001" voltageSetpoint="405" bus="B1" connectableBus="B1" p="100" q="50">
+                <iidm:reactiveCapabilityCurve>
+                    <iidm:point p="5" minQ="0" maxQ="10"/>
+                    <iidm:point p="10" minQ="0" maxQ="10"/>
+                </iidm:reactiveCapabilityCurve>
+            </iidm:vscConverterStation>
+        </iidm:voltageLevel>
+    </iidm:substation>
+    <iidm:substation id="S2" country="FR">
+        <iidm:voltageLevel id="VL2" nominalV="400" topologyKind="NODE_BREAKER">
+            <iidm:nodeBreakerTopology>
+                <iidm:busbarSection id="BBS1" name="BusbarSection" node="0"/>
+                <iidm:switch id="DISC_BBS1_BK1" name="Disconnector" kind="DISCONNECTOR" retained="false" open="false" node1="0" node2="1"/>
+                <iidm:switch id="BK1" name="Breaker" kind="BREAKER" retained="true" open="false" node1="1" node2="2"/>
+            </iidm:nodeBreakerTopology>
+            <iidm:vscConverterStation id="C2" name="Converter2" voltageRegulatorOn="false" lossFactor="1.1000000000000001" reactivePowerSetpoint="123" node="2">
+                <iidm:minMaxReactiveLimits minQ="0" maxQ="10"/>
+            </iidm:vscConverterStation>
+        </iidm:voltageLevel>
+    </iidm:substation>
+    <iidm:hvdcLine id="L" name="HVDC" r="1" nominalV="400" convertersMode="SIDE_1_INVERTER_SIDE_2_RECTIFIER" activePowerSetpoint="280" maxP="300" converterStation1="C1" converterStation2="C2"/>
+</iidm:network>
diff --git a/test/resources/V1_5/batteryRoundTripRef.xml b/test/resources/V1_5/batteryRoundTripRef.xml
new file mode 100644
index 000000000..6abe91fe4
--- /dev/null
+++ b/test/resources/V1_5/batteryRoundTripRef.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" id="fictitious" caseDate="2017-06-25T17:43:00+01:00" forecastDistance="0" sourceFormat="test">
+    <iidm:substation id="P1" country="FR" tso="R" geographicalTags="A">
+        <iidm:voltageLevel id="VLGEN" nominalV="400" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NGEN"/>
+            </iidm:busBreakerTopology>
+            <iidm:generator id="GEN" energySource="OTHER" minP="-9999.9899999999998" maxP="9999.9899999999998" voltageRegulatorOn="true" targetP="607" targetV="24.5" targetQ="301" bus="NGEN" connectableBus="NGEN" p="-605" q="-225">
+                <iidm:minMaxReactiveLimits minQ="-9999.9899999999998" maxQ="9999.9899999999998"/>
+            </iidm:generator>
+        </iidm:voltageLevel>
+    </iidm:substation>
+    <iidm:substation id="P2" country="FR" tso="R" geographicalTags="B">
+        <iidm:voltageLevel id="VLBAT" nominalV="400" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NBAT"/>
+            </iidm:busBreakerTopology>
+            <iidm:battery id="BAT" p0="9999.9899999999998" q0="9999.9899999999998" minP="-9999.9899999999998" maxP="9999.9899999999998" bus="NBAT" connectableBus="NBAT" p="-605" q="-225">
+                <iidm:minMaxReactiveLimits minQ="-9999.9899999999998" maxQ="9999.9899999999998"/>
+            </iidm:battery>
+            <iidm:battery id="BAT2" p0="100" q0="200" minP="-200" maxP="200" bus="NBAT" connectableBus="NBAT" p="-605" q="-225">
+                <iidm:reactiveCapabilityCurve>
+                    <iidm:point p="0" minQ="-59.299999999999997" maxQ="60"/>
+                    <iidm:point p="70" minQ="-54.549999999999997" maxQ="46.25"/>
+                </iidm:reactiveCapabilityCurve>
+            </iidm:battery>
+            <iidm:load id="LOAD" loadType="UNDEFINED" p0="600" q0="200" bus="NBAT" connectableBus="NBAT"/>
+        </iidm:voltageLevel>
+    </iidm:substation>
+    <iidm:line id="NHV1_NHV2_1" r="3" x="33" g1="0" b1="0.000193" g2="0" b2="0.000193" bus1="NGEN" connectableBus1="NGEN" voltageLevelId1="VLGEN" bus2="NBAT" connectableBus2="NBAT" voltageLevelId2="VLBAT"/>
+    <iidm:line id="NHV1_NHV2_2" r="3" x="33" g1="0" b1="0.000193" g2="0" b2="0.000193" bus1="NGEN" connectableBus1="NGEN" voltageLevelId1="VLGEN" bus2="NBAT" connectableBus2="NBAT" voltageLevelId2="VLBAT"/>
+</iidm:network>
diff --git a/test/resources/V1_5/completeThreeWindingsTransformerRoundTripRef.xml b/test/resources/V1_5/completeThreeWindingsTransformerRoundTripRef.xml
new file mode 100644
index 000000000..3ee8c07e5
--- /dev/null
+++ b/test/resources/V1_5/completeThreeWindingsTransformerRoundTripRef.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" id="three-windings-transformer" caseDate="2018-03-05T13:30:30.486000+01:00" forecastDistance="0" sourceFormat="test">
+    <iidm:substation id="SUBSTATION" country="FR">
+        <iidm:voltageLevel id="VL_132" nominalV="132" lowVoltageLimit="118.8" highVoltageLimit="145.19999999999999" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="BUS_132" v="133.584" angle="-9.6199999999999992"/>
+            </iidm:busBreakerTopology>
+            <iidm:generator id="GEN_132" energySource="OTHER" minP="0" maxP="140" voltageRegulatorOn="true" targetP="7.2000000000000002" targetV="135" bus="BUS_132" connectableBus="BUS_132">
+                <iidm:minMaxReactiveLimits minQ="-1.7976931348623157e+308" maxQ="1.7976931348623157e+308"/>
+            </iidm:generator>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VL_33" nominalV="33" lowVoltageLimit="29.699999999999999" highVoltageLimit="36.299999999999997" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="BUS_33" v="34.881" angle="-15.24"/>
+            </iidm:busBreakerTopology>
+            <iidm:load id="LOAD_33" loadType="UNDEFINED" p0="11.199999999999999" q0="7.5" bus="BUS_33" connectableBus="BUS_33" p="11.199999999999999" q="7.5"/>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VL_11" nominalV="11" lowVoltageLimit="9.9000000000000004" highVoltageLimit="12.1" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="BUS_11" v="11.781000000000001" angle="-15.24"/>
+            </iidm:busBreakerTopology>
+            <iidm:load id="LOAD_11" loadType="UNDEFINED" p0="0" q0="-10.6" bus="BUS_11" connectableBus="BUS_11" p="0" q="-10.6"/>
+        </iidm:voltageLevel>
+        <iidm:threeWindingsTransformer id="3WT" r1="17.423999999999999" x1="1.7423999999999999" g1="0.0057392102846648297" b1="0.00057392102846648299" ratedU1="132" ratedS1="1" r2="1.089" x2="0.1089" g2="0" b2="0" ratedU2="33" ratedS2="2" r3="0.121" x3="0.0121" g3="0" b3="0" ratedU3="11" ratedS3="3" ratedU0="132" bus1="BUS_132" connectableBus1="BUS_132" voltageLevelId1="VL_132" bus2="BUS_33" connectableBus2="BUS_33" voltageLevelId2="VL_33" bus3="BUS_11" connectableBus3="BUS_11" voltageLevelId3="VL_11">
+            <iidm:ratioTapChanger1 lowTapPosition="0" tapPosition="0" targetDeadband="0" loadTapChangingCapabilities="false">
+                <iidm:step r="1.089" x="0.1089" g="0.091827364554637275" b="0.0091827364554637279" rho="1"/>
+            </iidm:ratioTapChanger1>
+            <iidm:phaseTapChanger1 lowTapPosition="1" tapPosition="2" regulationMode="FIXED_TAP">
+                <iidm:step r="0.10000000149011612" x="0.10000000149011612" g="0.10000000149011612" b="0.10000000149011612" rho="1" alpha="-50"/>
+                <iidm:step r="0.10000000149011612" x="0.10000000149011612" g="0.10000000149011612" b="0.10000000149011612" rho="1" alpha="-25"/>
+            </iidm:phaseTapChanger1>
+            <iidm:ratioTapChanger2 lowTapPosition="0" tapPosition="2" targetDeadband="0" loadTapChangingCapabilities="true" regulating="true" targetV="33">
+                <iidm:terminalRef id="LOAD_33"/>
+                <iidm:step r="0.98009999999999997" x="0.09801" g="0.082644628099173556" b="0.0082644628099173556" rho="0.90000000000000002"/>
+                <iidm:step r="1.089" x="0.1089" g="0.091827364554637275" b="0.0091827364554637279" rho="1"/>
+                <iidm:step r="1.1979" x="0.11978999999999999" g="0.10101010101010101" b="0.0101010101010101" rho="1.1000000000000001"/>
+            </iidm:ratioTapChanger2>
+            <iidm:phaseTapChanger2 lowTapPosition="1" tapPosition="2" regulationMode="FIXED_TAP">
+                <iidm:step r="0.10000000149011612" x="0.10000000149011612" g="0.10000000149011612" b="0.10000000149011612" rho="1" alpha="-50"/>
+                <iidm:step r="0.10000000149011612" x="0.10000000149011612" g="0.10000000149011612" b="0.10000000149011612" rho="1" alpha="-25"/>
+            </iidm:phaseTapChanger2>
+            <iidm:ratioTapChanger3 lowTapPosition="0" tapPosition="0" targetDeadband="0" loadTapChangingCapabilities="true" regulating="false" targetV="11">
+                <iidm:terminalRef id="LOAD_11"/>
+                <iidm:step r="0.1089" x="0.01089" g="0.82644628099173556" b="0.082644628099173556" rho="0.90000000000000002"/>
+                <iidm:step r="0.121" x="0.0121" g="0.82644628099173556" b="0.082644628099173556" rho="1"/>
+                <iidm:step r="0.1331" x="0.013310000000000001" g="0.90909090909090917" b="0.090909090909090925" rho="1.1000000000000001"/>
+            </iidm:ratioTapChanger3>
+            <iidm:phaseTapChanger3 lowTapPosition="1" tapPosition="2" regulationMode="FIXED_TAP">
+                <iidm:step r="0.10000000149011612" x="0.10000000149011612" g="0.10000000149011612" b="0.10000000149011612" rho="1" alpha="-50"/>
+                <iidm:step r="0.10000000149011612" x="0.10000000149011612" g="0.10000000149011612" b="0.10000000149011612" rho="1" alpha="-25"/>
+            </iidm:phaseTapChanger3>
+            <iidm:currentLimits1 permanentLimit="1000">
+                <iidm:temporaryLimit name="20'" acceptableDuration="1200" value="1200"/>
+                <iidm:temporaryLimit name="10'" acceptableDuration="600" value="1400"/>
+            </iidm:currentLimits1>
+            <iidm:currentLimits2 permanentLimit="100">
+                <iidm:temporaryLimit name="20'" acceptableDuration="1200" value="120"/>
+                <iidm:temporaryLimit name="10'" acceptableDuration="600" value="140"/>
+            </iidm:currentLimits2>
+            <iidm:currentLimits3 permanentLimit="10">
+                <iidm:temporaryLimit name="20'" acceptableDuration="1200" value="12"/>
+                <iidm:temporaryLimit name="10'" acceptableDuration="600" value="14"/>
+            </iidm:currentLimits3>
+        </iidm:threeWindingsTransformer>
+    </iidm:substation>
+</iidm:network>
diff --git a/test/resources/V1_5/danglingLine.xml b/test/resources/V1_5/danglingLine.xml
new file mode 100644
index 000000000..89490b29b
--- /dev/null
+++ b/test/resources/V1_5/danglingLine.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" id="sim1" caseDate="2013-01-15T18:45:00+01:00" forecastDistance="0" sourceFormat="test">
+    <iidm:substation id="P2" country="FR" tso="RTE" geographicalTags="B">
+        <iidm:voltageLevel id="VLHV2" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV2" v="389.95267639160159" angle="-3.5063576698303223"/>
+            </iidm:busBreakerTopology>
+            <iidm:danglingLine id="NHV1_NHV2_1" p0="-300.43389892578125" q0="-137.18849182128906" r="1.5" x="16.5" g="0" b="0.000193" bus="NHV2" connectableBus="NHV2" p="-300.43389892578125" q="-137.18849182128906"/>
+            <iidm:danglingLine id="NHV1_NHV2_2" p0="-300.43389892578125" q0="-137.18849182128906" r="1.5" x="16.5" g="0" b="0.000193" bus="NHV2" connectableBus="NHV2" p="-300.43389892578125" q="-137.18849182128906"/>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLLOAD" nominalV="150" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NLOAD" v="147.57861328125" angle="-9.6144866943359375"/>
+            </iidm:busBreakerTopology>
+            <iidm:load id="LOAD" loadType="UNDEFINED" p0="600" q0="200" bus="NLOAD" connectableBus="NLOAD" p="600" q="200"/>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NHV2_NLOAD" r="0.047249999999999993" x="4.0497243656204551" g="0" b="0" ratedU1="400" ratedU2="158" bus1="NHV2" connectableBus1="NHV2" voltageLevelId1="VLHV2" bus2="NLOAD" connectableBus2="NLOAD" voltageLevelId2="VLLOAD" p1="600.8677978515625" q1="274.37698364257" p2="-600" q2="-200">
+            <iidm:ratioTapChanger lowTapPosition="0" tapPosition="1" targetDeadband="0" loadTapChangingCapabilities="true" regulating="true" targetV="158">
+                <iidm:terminalRef id="NHV2_NLOAD" side="TWO"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="0.85056669052441913"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.0006666666666666"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.1507666428089141"/>
+            </iidm:ratioTapChanger>
+        </iidm:twoWindingsTransformer>
+    </iidm:substation>
+</iidm:network>
diff --git a/test/resources/V1_5/danglingLineWithGeneration.xml b/test/resources/V1_5/danglingLineWithGeneration.xml
new file mode 100644
index 000000000..6bc43ccda
--- /dev/null
+++ b/test/resources/V1_5/danglingLineWithGeneration.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" id="dangling-line" caseDate="2020-07-16T10:08:48.321000+02:00" forecastDistance="0" sourceFormat="test">
+    <iidm:substation id="S" country="FR">
+        <iidm:voltageLevel id="VL" nominalV="100" lowVoltageLimit="80" highVoltageLimit="120" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="BUS"/>
+            </iidm:busBreakerTopology>
+            <iidm:generator id="G" energySource="OTHER" minP="0" maxP="100" voltageRegulatorOn="true" targetP="50" targetV="100" targetQ="30" bus="BUS" connectableBus="BUS">
+                <iidm:minMaxReactiveLimits minQ="-1.7976931348623157e+308" maxQ="1.7976931348623157e+308"/>
+            </iidm:generator>
+            <iidm:danglingLine id="DL" p0="50" q0="30" r="10" x="1" g="0.0001" b="1.0000000000000001e-05" generationMinP="0" generationMaxP="900" generationVoltageRegulationOn="true" generationTargetP="440" generationTargetV="400" bus="BUS" connectableBus="BUS">
+                <iidm:property name="test" value="test"/>
+                <iidm:reactiveCapabilityCurve>
+                    <iidm:point p="0" minQ="-59.299999999999997" maxQ="60"/>
+                    <iidm:point p="70" minQ="-54.549999999999997" maxQ="46.25"/>
+                </iidm:reactiveCapabilityCurve>
+                <iidm:currentLimits permanentLimit="100">
+                    <iidm:temporaryLimit name="20'" acceptableDuration="1200" value="120"/>
+                    <iidm:temporaryLimit name="10'" acceptableDuration="600" value="140"/>
+                </iidm:currentLimits>
+            </iidm:danglingLine>
+        </iidm:voltageLevel>
+    </iidm:substation>
+</iidm:network>
diff --git a/test/resources/V1_5/eurostag-tutorial-example1-properties.xml b/test/resources/V1_5/eurostag-tutorial-example1-properties.xml
new file mode 100644
index 000000000..addb5a415
--- /dev/null
+++ b/test/resources/V1_5/eurostag-tutorial-example1-properties.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" id="sim1" caseDate="2013-01-15T18:45:00+01:00" forecastDistance="0" sourceFormat="test">
+    <iidm:property name="prop1" value="value1"/>
+    <iidm:substation id="P1" country="FR" tso="RTE" geographicalTags="A">
+        <iidm:property name="prop2" value="value2"/>
+        <iidm:voltageLevel id="VLGEN" nominalV="24" topologyKind="BUS_BREAKER">
+            <iidm:property name="prop3" value="value3"/>
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NGEN"/>
+            </iidm:busBreakerTopology>
+            <iidm:generator id="GEN" energySource="OTHER" minP="-9999.9899999999998" maxP="9999.9899999999998" voltageRegulatorOn="true" targetP="607" targetV="24.5" targetQ="301" bus="NGEN" connectableBus="NGEN">
+                <iidm:minMaxReactiveLimits minQ="-9999.9899999999998" maxQ="9999.9899999999998"/>
+            </iidm:generator>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLHV1" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV1"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NGEN_NHV1" r="0.26658461538461536" x="11.104492831516762" g="0" b="0" ratedU1="24" ratedU2="400" bus1="NGEN" connectableBus1="NGEN" voltageLevelId1="VLGEN" bus2="NHV1" connectableBus2="NHV1" voltageLevelId2="VLHV1"/>
+    </iidm:substation>
+    <iidm:substation id="P2" country="FR" tso="RTE" geographicalTags="B">
+        <iidm:voltageLevel id="VLHV2" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV2"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLLOAD" nominalV="150" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NLOAD"/>
+            </iidm:busBreakerTopology>
+            <iidm:load id="LOAD" loadType="UNDEFINED" p0="600" q0="200" bus="NLOAD" connectableBus="NLOAD"/>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NHV2_NLOAD" r="0.047249999999999993" x="4.0497243656204551" g="0" b="0" ratedU1="400" ratedU2="158" bus1="NHV2" connectableBus1="NHV2" voltageLevelId1="VLHV2" bus2="NLOAD" connectableBus2="NLOAD" voltageLevelId2="VLLOAD">
+            <iidm:ratioTapChanger lowTapPosition="0" tapPosition="1" targetDeadband="0" loadTapChangingCapabilities="true" regulating="true" targetV="158">
+                <iidm:terminalRef id="NHV2_NLOAD" side="TWO"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="0.85056669052441913"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.0006666666666666"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.1507666428089141"/>
+            </iidm:ratioTapChanger>
+        </iidm:twoWindingsTransformer>
+    </iidm:substation>
+    <iidm:line id="NHV1_NHV2_1" r="3" x="33" g1="0" b1="0.000193" g2="0" b2="0.000193" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2">
+        <iidm:property name="prop4" value="value4"/>
+    </iidm:line>
+    <iidm:line id="NHV1_NHV2_2" r="3" x="33" g1="0" b1="0.000193" g2="0" b2="0.000193" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2"/>
+</iidm:network>
diff --git a/test/resources/V1_5/eurostag-tutorial-example1-terminalMock.xml b/test/resources/V1_5/eurostag-tutorial-example1-terminalMock.xml
new file mode 100644
index 000000000..051a2a556
--- /dev/null
+++ b/test/resources/V1_5/eurostag-tutorial-example1-terminalMock.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" xmlns:mock="http://www.powsybl.org/schema/iidm/ext/terminal_mock/1_5" id="sim1" caseDate="2013-01-15T18:45:00.000+01:00" forecastDistance="0" sourceFormat="test">
+    <iidm:extension id="LOAD">
+        <mock:terminalMock>
+            <mock:terminal id="LOAD"/>
+        </mock:terminalMock>
+    </iidm:extension>
+</iidm:network>
diff --git a/test/resources/V1_5/eurostag-tutorial-example1-with-bad-loadMockExt.xml b/test/resources/V1_5/eurostag-tutorial-example1-with-bad-loadMockExt.xml
new file mode 100644
index 000000000..1f829d92c
--- /dev/null
+++ b/test/resources/V1_5/eurostag-tutorial-example1-with-bad-loadMockExt.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" xmlns:lmock="http://www.powsybl.org/schema/iidm/ext/load_mock/1_0" id="sim1" caseDate="2013-01-15T18:45:00.000+01:00" forecastDistance="0" sourceFormat="test">
+    <iidm:substation id="P1" country="FR" tso="RTE" geographicalTags="A">
+        <iidm:voltageLevel id="VLGEN" nominalV="24.0" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NGEN"/>
+            </iidm:busBreakerTopology>
+            <iidm:generator id="GEN" energySource="OTHER" minP="-9999.99" maxP="9999.99" voltageRegulatorOn="true" targetP="607.0" targetV="24.5" targetQ="301.0" bus="NGEN" connectableBus="NGEN">
+                <iidm:minMaxReactiveLimits minQ="-9999.99" maxQ="9999.99"/>
+            </iidm:generator>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLHV1" nominalV="380.0" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV1"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NGEN_NHV1" r="0.26658461538461536" x="11.104492831516762" g="0.0" b="0.0" ratedU1="24.0" ratedU2="400.0" bus1="NGEN" connectableBus1="NGEN" voltageLevelId1="VLGEN" bus2="NHV1" connectableBus2="NHV1" voltageLevelId2="VLHV1"/>
+    </iidm:substation>
+    <iidm:substation id="P2" country="FR" tso="RTE" geographicalTags="B">
+        <iidm:voltageLevel id="VLHV2" nominalV="380.0" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV2"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLLOAD" nominalV="150.0" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NLOAD"/>
+            </iidm:busBreakerTopology>
+            <iidm:load id="LOAD" loadType="UNDEFINED" p0="600.0" q0="200.0" bus="NLOAD" connectableBus="NLOAD"/>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NHV2_NLOAD" r="0.04724999999999999" x="4.049724365620455" g="0.0" b="0.0" ratedU1="400.0" ratedU2="158.0" bus1="NHV2" connectableBus1="NHV2" voltageLevelId1="VLHV2" bus2="NLOAD" connectableBus2="NLOAD" voltageLevelId2="VLLOAD">
+            <iidm:ratioTapChanger lowTapPosition="0" tapPosition="1" regulating="true" loadTapChangingCapabilities="true" targetV="158.0">
+                <iidm:terminalRef id="NHV2_NLOAD" side="TWO"/>
+                <iidm:step r="0.0" x="0.0" g="0.0" b="0.0" rho="0.8505666905244191"/>
+                <iidm:step r="0.0" x="0.0" g="0.0" b="0.0" rho="1.0006666666666666"/>
+                <iidm:step r="0.0" x="0.0" g="0.0" b="0.0" rho="1.150766642808914"/>
+            </iidm:ratioTapChanger>
+        </iidm:twoWindingsTransformer>
+    </iidm:substation>
+    <iidm:line id="NHV1_NHV2_1" r="3.0" x="33.0" g1="0.0" b1="1.93E-4" g2="0.0" b2="1.93E-4" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2"/>
+    <iidm:line id="NHV1_NHV2_2" r="3.0" x="33.0" g1="0.0" b1="1.93E-4" g2="0.0" b2="1.93E-4" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2"/>
+    <iidm:extension id="LOAD">
+        <lmock:loadMock/>
+    </iidm:extension>
+</iidm:network>
diff --git a/test/resources/V1_5/eurostag-tutorial-example1-with-bad-loadQuxExt.xml b/test/resources/V1_5/eurostag-tutorial-example1-with-bad-loadQuxExt.xml
new file mode 100644
index 000000000..9523d74c6
--- /dev/null
+++ b/test/resources/V1_5/eurostag-tutorial-example1-with-bad-loadQuxExt.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" xmlns:lq="http://www.powsybl.org/schema/iidm/ext/load_qux/1_0" id="sim1" caseDate="2013-01-15T18:45:00.000+01:00" forecastDistance="0" sourceFormat="test">
+    <iidm:substation id="P1" country="FR" tso="RTE" geographicalTags="A">
+        <iidm:voltageLevel id="VLGEN" nominalV="24.0" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NGEN"/>
+            </iidm:busBreakerTopology>
+            <iidm:generator id="GEN" energySource="OTHER" minP="-9999.99" maxP="9999.99" voltageRegulatorOn="true" targetP="607.0" targetV="24.5" targetQ="301.0" bus="NGEN" connectableBus="NGEN">
+                <iidm:minMaxReactiveLimits minQ="-9999.99" maxQ="9999.99"/>
+            </iidm:generator>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLHV1" nominalV="380.0" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV1"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NGEN_NHV1" r="0.26658461538461536" x="11.104492831516762" g="0.0" b="0.0" ratedU1="24.0" ratedU2="400.0" bus1="NGEN" connectableBus1="NGEN" voltageLevelId1="VLGEN" bus2="NHV1" connectableBus2="NHV1" voltageLevelId2="VLHV1"/>
+    </iidm:substation>
+    <iidm:substation id="P2" country="FR" tso="RTE" geographicalTags="B">
+        <iidm:voltageLevel id="VLHV2" nominalV="380.0" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV2"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLLOAD" nominalV="150.0" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NLOAD"/>
+            </iidm:busBreakerTopology>
+            <iidm:load id="LOAD" loadType="UNDEFINED" p0="600.0" q0="200.0" bus="NLOAD" connectableBus="NLOAD"/>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NHV2_NLOAD" r="0.04724999999999999" x="4.049724365620455" g="0.0" b="0.0" ratedU1="400.0" ratedU2="158.0" bus1="NHV2" connectableBus1="NHV2" voltageLevelId1="VLHV2" bus2="NLOAD" connectableBus2="NLOAD" voltageLevelId2="VLLOAD">
+            <iidm:ratioTapChanger lowTapPosition="0" tapPosition="1" regulating="true" loadTapChangingCapabilities="true" targetV="158.0">
+                <iidm:terminalRef id="NHV2_NLOAD" side="TWO"/>
+                <iidm:step r="0.0" x="0.0" g="0.0" b="0.0" rho="0.8505666905244191"/>
+                <iidm:step r="0.0" x="0.0" g="0.0" b="0.0" rho="1.0006666666666666"/>
+                <iidm:step r="0.0" x="0.0" g="0.0" b="0.0" rho="1.150766642808914"/>
+            </iidm:ratioTapChanger>
+        </iidm:twoWindingsTransformer>
+    </iidm:substation>
+    <iidm:line id="NHV1_NHV2_1" r="3.0" x="33.0" g1="0.0" b1="1.93E-4" g2="0.0" b2="1.93E-4" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2"/>
+    <iidm:line id="NHV1_NHV2_2" r="3.0" x="33.0" g1="0.0" b1="1.93E-4" g2="0.0" b2="1.93E-4" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2"/>
+    <iidm:extension id="LOAD">
+        <lq:loadQux/>
+    </iidm:extension>
+</iidm:network>
diff --git a/test/resources/V1_5/eurostag-tutorial-example1-with-loadMockExt-1_1.xml b/test/resources/V1_5/eurostag-tutorial-example1-with-loadMockExt-1_1.xml
new file mode 100644
index 000000000..b95b529c6
--- /dev/null
+++ b/test/resources/V1_5/eurostag-tutorial-example1-with-loadMockExt-1_1.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" xmlns:lmock="http://www.powsybl.org/schema/iidm/ext/load_mock/1_1" id="sim1" caseDate="2013-01-15T18:45:00+01:00" forecastDistance="0" sourceFormat="test">
+    <iidm:substation id="P1" country="FR" tso="RTE" geographicalTags="A">
+        <iidm:voltageLevel id="VLGEN" nominalV="24" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NGEN"/>
+            </iidm:busBreakerTopology>
+            <iidm:generator id="GEN" energySource="OTHER" minP="-9999.9899999999998" maxP="9999.9899999999998" voltageRegulatorOn="true" targetP="607" targetV="24.5" targetQ="301" bus="NGEN" connectableBus="NGEN">
+                <iidm:minMaxReactiveLimits minQ="-9999.9899999999998" maxQ="9999.9899999999998"/>
+            </iidm:generator>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLHV1" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV1"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NGEN_NHV1" r="0.26658461538461536" x="11.104492831516762" g="0" b="0" ratedU1="24" ratedU2="400" bus1="NGEN" connectableBus1="NGEN" voltageLevelId1="VLGEN" bus2="NHV1" connectableBus2="NHV1" voltageLevelId2="VLHV1"/>
+    </iidm:substation>
+    <iidm:substation id="P2" country="FR" tso="RTE" geographicalTags="B">
+        <iidm:voltageLevel id="VLHV2" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV2"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLLOAD" nominalV="150" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NLOAD"/>
+            </iidm:busBreakerTopology>
+            <iidm:load id="LOAD" loadType="UNDEFINED" p0="600" q0="200" bus="NLOAD" connectableBus="NLOAD"/>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NHV2_NLOAD" r="0.047249999999999993" x="4.0497243656204551" g="0" b="0" ratedU1="400" ratedU2="158" bus1="NHV2" connectableBus1="NHV2" voltageLevelId1="VLHV2" bus2="NLOAD" connectableBus2="NLOAD" voltageLevelId2="VLLOAD">
+            <iidm:ratioTapChanger lowTapPosition="0" tapPosition="1" loadTapChangingCapabilities="true" regulating="true" targetV="158">
+                <iidm:terminalRef id="NHV2_NLOAD" side="TWO"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="0.85056669052441913"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.0006666666666666"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.1507666428089141"/>
+            </iidm:ratioTapChanger>
+        </iidm:twoWindingsTransformer>
+    </iidm:substation>
+    <iidm:line id="NHV1_NHV2_1" r="3" x="33" g1="0" b1="0.000193" g2="0" b2="0.000193" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2"/>
+    <iidm:line id="NHV1_NHV2_2" r="3" x="33" g1="0" b1="0.000193" g2="0" b2="0.000193" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2"/>
+    <iidm:extension id="LOAD">
+        <lmock:loadMock/>
+    </iidm:extension>
+</iidm:network>
diff --git a/test/resources/V1_5/eurostag-tutorial-example1-with-loadMockExt-1_2.xml b/test/resources/V1_5/eurostag-tutorial-example1-with-loadMockExt-1_2.xml
new file mode 100644
index 000000000..099a2a0c6
--- /dev/null
+++ b/test/resources/V1_5/eurostag-tutorial-example1-with-loadMockExt-1_2.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" xmlns:lmock="http://www.powsybl.org/schema/iidm/ext/load_mock/1_2" id="sim1" caseDate="2013-01-15T18:45:00+01:00" forecastDistance="0" sourceFormat="test">
+    <iidm:substation id="P1" country="FR" tso="RTE" geographicalTags="A">
+        <iidm:voltageLevel id="VLGEN" nominalV="24" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NGEN"/>
+            </iidm:busBreakerTopology>
+            <iidm:generator id="GEN" energySource="OTHER" minP="-9999.9899999999998" maxP="9999.9899999999998" voltageRegulatorOn="true" targetP="607" targetV="24.5" targetQ="301" bus="NGEN" connectableBus="NGEN">
+                <iidm:minMaxReactiveLimits minQ="-9999.9899999999998" maxQ="9999.9899999999998"/>
+            </iidm:generator>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLHV1" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV1"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NGEN_NHV1" r="0.26658461538461536" x="11.104492831516762" g="0" b="0" ratedU1="24" ratedU2="400" bus1="NGEN" connectableBus1="NGEN" voltageLevelId1="VLGEN" bus2="NHV1" connectableBus2="NHV1" voltageLevelId2="VLHV1"/>
+    </iidm:substation>
+    <iidm:substation id="P2" country="FR" tso="RTE" geographicalTags="B">
+        <iidm:voltageLevel id="VLHV2" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV2"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLLOAD" nominalV="150" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NLOAD"/>
+            </iidm:busBreakerTopology>
+            <iidm:load id="LOAD" loadType="UNDEFINED" p0="600" q0="200" bus="NLOAD" connectableBus="NLOAD"/>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NHV2_NLOAD" r="0.047249999999999993" x="4.0497243656204551" g="0" b="0" ratedU1="400" ratedU2="158" bus1="NHV2" connectableBus1="NHV2" voltageLevelId1="VLHV2" bus2="NLOAD" connectableBus2="NLOAD" voltageLevelId2="VLLOAD">
+            <iidm:ratioTapChanger lowTapPosition="0" tapPosition="1" loadTapChangingCapabilities="true" regulating="true" targetV="158">
+                <iidm:terminalRef id="NHV2_NLOAD" side="TWO"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="0.85056669052441913"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.0006666666666666"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.1507666428089141"/>
+            </iidm:ratioTapChanger>
+        </iidm:twoWindingsTransformer>
+    </iidm:substation>
+    <iidm:line id="NHV1_NHV2_1" r="3" x="33" g1="0" b1="0.000193" g2="0" b2="0.000193" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2"/>
+    <iidm:line id="NHV1_NHV2_2" r="3" x="33" g1="0" b1="0.000193" g2="0" b2="0.000193" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2"/>
+    <iidm:extension id="LOAD">
+        <lmock:loadMock/>
+    </iidm:extension>
+</iidm:network>
diff --git a/test/resources/V1_5/eurostag-tutorial-example1-with-loadMockExt-1_3.xml b/test/resources/V1_5/eurostag-tutorial-example1-with-loadMockExt-1_3.xml
new file mode 100644
index 000000000..5b41ab22a
--- /dev/null
+++ b/test/resources/V1_5/eurostag-tutorial-example1-with-loadMockExt-1_3.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" xmlns:lmock="http://www.powsybl.org/schema/iidm/ext/load_mock/1_3" id="sim1" caseDate="2013-01-15T18:45:00+01:00" forecastDistance="0" sourceFormat="test">
+    <iidm:substation id="P1" country="FR" tso="RTE" geographicalTags="A">
+        <iidm:voltageLevel id="VLGEN" nominalV="24" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NGEN"/>
+            </iidm:busBreakerTopology>
+            <iidm:generator id="GEN" energySource="OTHER" minP="-9999.9899999999998" maxP="9999.9899999999998" voltageRegulatorOn="true" targetP="607" targetV="24.5" targetQ="301" bus="NGEN" connectableBus="NGEN">
+                <iidm:minMaxReactiveLimits minQ="-9999.9899999999998" maxQ="9999.9899999999998"/>
+            </iidm:generator>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLHV1" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV1"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NGEN_NHV1" r="0.26658461538461536" x="11.104492831516762" g="0" b="0" ratedU1="24" ratedU2="400" bus1="NGEN" connectableBus1="NGEN" voltageLevelId1="VLGEN" bus2="NHV1" connectableBus2="NHV1" voltageLevelId2="VLHV1"/>
+    </iidm:substation>
+    <iidm:substation id="P2" country="FR" tso="RTE" geographicalTags="B">
+        <iidm:voltageLevel id="VLHV2" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV2"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLLOAD" nominalV="150" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NLOAD"/>
+            </iidm:busBreakerTopology>
+            <iidm:load id="LOAD" loadType="UNDEFINED" p0="600" q0="200" bus="NLOAD" connectableBus="NLOAD"/>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NHV2_NLOAD" r="0.047249999999999993" x="4.0497243656204551" g="0" b="0" ratedU1="400" ratedU2="158" bus1="NHV2" connectableBus1="NHV2" voltageLevelId1="VLHV2" bus2="NLOAD" connectableBus2="NLOAD" voltageLevelId2="VLLOAD">
+            <iidm:ratioTapChanger lowTapPosition="0" tapPosition="1" loadTapChangingCapabilities="true" regulating="true" targetV="158">
+                <iidm:terminalRef id="NHV2_NLOAD" side="TWO"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="0.85056669052441913"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.0006666666666666"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.1507666428089141"/>
+            </iidm:ratioTapChanger>
+        </iidm:twoWindingsTransformer>
+    </iidm:substation>
+    <iidm:line id="NHV1_NHV2_1" r="3" x="33" g1="0" b1="0.000193" g2="0" b2="0.000193" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2"/>
+    <iidm:line id="NHV1_NHV2_2" r="3" x="33" g1="0" b1="0.000193" g2="0" b2="0.000193" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2"/>
+    <iidm:extension id="LOAD">
+        <lmock:loadMock/>
+    </iidm:extension>
+</iidm:network>
diff --git a/test/resources/V1_5/eurostag-tutorial-example1-with-terminalMock-ext.xml b/test/resources/V1_5/eurostag-tutorial-example1-with-terminalMock-ext.xml
new file mode 100644
index 000000000..11f73ba31
--- /dev/null
+++ b/test/resources/V1_5/eurostag-tutorial-example1-with-terminalMock-ext.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" xmlns:mock="http://www.powsybl.org/schema/iidm/ext/terminal_mock/1_5" id="sim1" caseDate="2013-01-15T18:45:00+01:00" forecastDistance="0" sourceFormat="test">
+    <iidm:substation id="P1" country="FR" tso="RTE" geographicalTags="A">
+        <iidm:voltageLevel id="VLGEN" nominalV="24" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NGEN"/>
+            </iidm:busBreakerTopology>
+            <iidm:generator id="GEN" energySource="OTHER" minP="-9999.9899999999998" maxP="9999.9899999999998" voltageRegulatorOn="true" targetP="607" targetV="24.5" targetQ="301" bus="NGEN" connectableBus="NGEN">
+                <iidm:minMaxReactiveLimits minQ="-9999.9899999999998" maxQ="9999.9899999999998"/>
+            </iidm:generator>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLHV1" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV1"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NGEN_NHV1" r="0.26658461538461536" x="11.104492831516762" g="0" b="0" ratedU1="24" ratedU2="400" bus1="NGEN" connectableBus1="NGEN" voltageLevelId1="VLGEN" bus2="NHV1" connectableBus2="NHV1" voltageLevelId2="VLHV1"/>
+    </iidm:substation>
+    <iidm:substation id="P2" country="FR" tso="RTE" geographicalTags="B">
+        <iidm:voltageLevel id="VLHV2" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV2"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLLOAD" nominalV="150" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NLOAD"/>
+            </iidm:busBreakerTopology>
+            <iidm:load id="LOAD" loadType="UNDEFINED" p0="600" q0="200" bus="NLOAD" connectableBus="NLOAD"/>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NHV2_NLOAD" r="0.047249999999999993" x="4.0497243656204551" g="0" b="0" ratedU1="400" ratedU2="158" bus1="NHV2" connectableBus1="NHV2" voltageLevelId1="VLHV2" bus2="NLOAD" connectableBus2="NLOAD" voltageLevelId2="VLLOAD">
+            <iidm:ratioTapChanger lowTapPosition="0" tapPosition="1" targetDeadband="0" loadTapChangingCapabilities="true" regulating="true" targetV="158">
+                <iidm:terminalRef id="NHV2_NLOAD" side="TWO"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="0.85056669052441913"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.0006666666666666"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.1507666428089141"/>
+            </iidm:ratioTapChanger>
+        </iidm:twoWindingsTransformer>
+    </iidm:substation>
+    <iidm:line id="NHV1_NHV2_1" r="3" x="33" g1="0" b1="0.000193" g2="0" b2="0.000193" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2"/>
+    <iidm:line id="NHV1_NHV2_2" r="3" x="33" g1="0" b1="0.000193" g2="0" b2="0.000193" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2"/>
+    <iidm:extension id="LOAD">
+        <mock:terminalMock>
+            <mock:terminal id="LOAD"/>
+        </mock:terminalMock>
+    </iidm:extension>
+</iidm:network>
diff --git a/test/resources/V1_5/eurostag-tutorial-example1.xml b/test/resources/V1_5/eurostag-tutorial-example1.xml
new file mode 100644
index 000000000..7acc8b721
--- /dev/null
+++ b/test/resources/V1_5/eurostag-tutorial-example1.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" id="sim1" caseDate="2013-01-15T18:45:00+01:00" forecastDistance="0" sourceFormat="test">
+    <iidm:substation id="P1" country="FR" tso="RTE" geographicalTags="A">
+        <iidm:voltageLevel id="VLGEN" nominalV="24" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NGEN"/>
+            </iidm:busBreakerTopology>
+            <iidm:generator id="GEN" energySource="OTHER" minP="-9999.9899999999998" maxP="9999.9899999999998" voltageRegulatorOn="true" targetP="607" targetV="24.5" targetQ="301" bus="NGEN" connectableBus="NGEN">
+                <iidm:minMaxReactiveLimits minQ="-9999.9899999999998" maxQ="9999.9899999999998"/>
+            </iidm:generator>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLHV1" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV1"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NGEN_NHV1" r="0.26658461538461536" x="11.104492831516762" g="0" b="0" ratedU1="24" ratedU2="400" bus1="NGEN" connectableBus1="NGEN" voltageLevelId1="VLGEN" bus2="NHV1" connectableBus2="NHV1" voltageLevelId2="VLHV1"/>
+    </iidm:substation>
+    <iidm:substation id="P2" country="FR" tso="RTE" geographicalTags="B">
+        <iidm:voltageLevel id="VLHV2" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV2"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLLOAD" nominalV="150" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NLOAD"/>
+            </iidm:busBreakerTopology>
+            <iidm:load id="LOAD" loadType="UNDEFINED" p0="600" q0="200" bus="NLOAD" connectableBus="NLOAD"/>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NHV2_NLOAD" r="0.047249999999999993" x="4.0497243656204551" g="0" b="0" ratedU1="400" ratedU2="158" bus1="NHV2" connectableBus1="NHV2" voltageLevelId1="VLHV2" bus2="NLOAD" connectableBus2="NLOAD" voltageLevelId2="VLLOAD">
+            <iidm:ratioTapChanger lowTapPosition="0" tapPosition="1" targetDeadband="0" loadTapChangingCapabilities="true" regulating="true" targetV="158">
+                <iidm:terminalRef id="NHV2_NLOAD" side="TWO"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="0.85056669052441913"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.0006666666666666"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.1507666428089141"/>
+            </iidm:ratioTapChanger>
+        </iidm:twoWindingsTransformer>
+    </iidm:substation>
+    <iidm:line id="NHV1_NHV2_1" r="3" x="33" g1="0" b1="0.000193" g2="0" b2="0.000193" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2"/>
+    <iidm:line id="NHV1_NHV2_2" r="3" x="33" g1="0" b1="0.000193" g2="0" b2="0.000193" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2"/>
+</iidm:network>
diff --git a/test/resources/V1_5/eurostag-tutorial1-lf.xml b/test/resources/V1_5/eurostag-tutorial1-lf.xml
new file mode 100644
index 000000000..6291f6f84
--- /dev/null
+++ b/test/resources/V1_5/eurostag-tutorial1-lf.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" id="sim1" caseDate="2013-01-15T18:45:00+01:00" forecastDistance="0" sourceFormat="test">
+    <iidm:substation id="P1" country="FR" tso="RTE" geographicalTags="A">
+        <iidm:voltageLevel id="VLGEN" nominalV="24" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NGEN" v="24.500000610351563" angle="2.3259763717651367"/>
+            </iidm:busBreakerTopology>
+            <iidm:generator id="GEN" energySource="OTHER" minP="-9999.9899999999998" maxP="9999.9899999999998" voltageRegulatorOn="true" targetP="607" targetV="24.5" targetQ="301" bus="NGEN" connectableBus="NGEN" p="-605.558349609375" q="-225.28251647949219">
+                <iidm:minMaxReactiveLimits minQ="-9999.9899999999998" maxQ="9999.9899999999998"/>
+            </iidm:generator>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLHV1" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV1" v="402.14284515380859" angle="0"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NGEN_NHV1" r="0.26658461538461536" x="11.104492831516762" g="0" b="0" ratedU1="24" ratedU2="400" bus1="NGEN" connectableBus1="NGEN" voltageLevelId1="VLGEN" bus2="NHV1" connectableBus2="NHV1" voltageLevelId2="VLHV1" p1="605.558349609375" q1="225.28251647949219" p2="-604.89093017578125" q2="-197.48046875"/>
+    </iidm:substation>
+    <iidm:substation id="P2" country="FR" tso="RTE" geographicalTags="B">
+        <iidm:voltageLevel id="VLHV2" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV2" v="389.95267639160159" angle="-3.5063576698303223"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLLOAD" nominalV="150" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NLOAD" v="147.57861328125" angle="-9.6144866943359375"/>
+            </iidm:busBreakerTopology>
+            <iidm:load id="LOAD" loadType="UNDEFINED" p0="600" q0="200" bus="NLOAD" connectableBus="NLOAD" p="600" q="200"/>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NHV2_NLOAD" r="0.047249999999999993" x="4.0497243656204551" g="0" b="0" ratedU1="400" ratedU2="158" bus1="NHV2" connectableBus1="NHV2" voltageLevelId1="VLHV2" bus2="NLOAD" connectableBus2="NLOAD" voltageLevelId2="VLLOAD" p1="600.8677978515625" q1="274.37698364257" p2="-600" q2="-200">
+            <iidm:ratioTapChanger lowTapPosition="0" tapPosition="1" targetDeadband="0" loadTapChangingCapabilities="true" regulating="true" targetV="158">
+                <iidm:terminalRef id="NHV2_NLOAD" side="TWO"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="0.85056669052441913"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.0006666666666666"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.1507666428089141"/>
+            </iidm:ratioTapChanger>
+        </iidm:twoWindingsTransformer>
+    </iidm:substation>
+    <iidm:line id="NHV1_NHV2_1" r="3" x="33" g1="0" b1="0.000193" g2="0" b2="0.000193" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906"/>
+    <iidm:line id="NHV1_NHV2_2" r="3" x="33" g1="0" b1="0.000193" g2="0" b2="0.000193" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906"/>
+</iidm:network>
diff --git a/test/resources/V1_5/fictitiousSwitchRef-bbk.xml b/test/resources/V1_5/fictitiousSwitchRef-bbk.xml
new file mode 100644
index 000000000..e520bf58e
--- /dev/null
+++ b/test/resources/V1_5/fictitiousSwitchRef-bbk.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" id="fictitious" caseDate="2017-06-25T17:43:00+01:00" forecastDistance="0" sourceFormat="test">
+    <iidm:substation id="A" country="FR">
+        <iidm:voltageLevel id="C" nominalV="225" lowVoltageLimit="0" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="C_0" v="234.40912" angle="0"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="N" nominalV="225" lowVoltageLimit="220" highVoltageLimit="245.00002000000001" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="N_0" v="236.44736" angle="15.250391"/>
+                <iidm:bus id="N_1" v="236.44736" angle="15.250391"/>
+                <iidm:bus id="N_11"/>
+                <iidm:bus id="N_13"/>
+                <iidm:bus id="N_2"/>
+                <iidm:bus id="N_3"/>
+                <iidm:bus id="N_12"/>
+                <iidm:bus id="N_14"/>
+                <iidm:switch id="BJ" name="BK" kind="BREAKER" retained="true" open="false" bus1="N_1" bus2="N_0"/>
+            </iidm:busBreakerTopology>
+            <iidm:generator id="CD" energySource="HYDRO" minP="0" maxP="35" voltageRegulatorOn="true" targetP="21.789588999999999" targetV="236.44736" targetQ="-20.701546" bus="N_0" connectableBus="N_0" p="-21.789588999999999" q="20.693394000000001">
+                <iidm:reactiveCapabilityCurve>
+                    <iidm:point p="0" minQ="-20.600000000000001" maxQ="18.100000000000001"/>
+                    <iidm:point p="35" minQ="-21.725000000000001" maxQ="6.3500003999999999"/>
+                </iidm:reactiveCapabilityCurve>
+            </iidm:generator>
+            <iidm:generator id="CB" energySource="HYDRO" minP="0" maxP="70" voltageRegulatorOn="false" targetP="0" targetV="0" targetQ="0" bus="N_12" connectableBus="N_12">
+                <iidm:reactiveCapabilityCurve>
+                    <iidm:point p="0" minQ="-59.299999999999997" maxQ="60"/>
+                    <iidm:point p="70" minQ="-54.549999999999997" maxQ="46.25"/>
+                </iidm:reactiveCapabilityCurve>
+            </iidm:generator>
+            <iidm:generator id="CC" energySource="HYDRO" minP="0" maxP="80" voltageRegulatorOn="false" targetP="0" targetV="0" targetQ="0" bus="N_14" connectableBus="N_14">
+                <iidm:reactiveCapabilityCurve>
+                    <iidm:point p="0" minQ="-56.799999999999997" maxQ="57.399999999999999"/>
+                    <iidm:point p="80" minQ="-53.514000000000003" maxQ="36.399999999999999"/>
+                </iidm:reactiveCapabilityCurve>
+            </iidm:generator>
+            <iidm:load id="CF" loadType="UNDEFINED" p0="8.4558540000000004" q0="-23.695924999999999" bus="N_1" connectableBus="N_1" p="8.4558540000000004" q="-23.695924999999999"/>
+            <iidm:load id="CG" loadType="UNDEFINED" p0="90.399109999999993" q0="-51.968690000000002" bus="N_1" connectableBus="N_1" p="90.399109999999993" q="-51.968690000000002"/>
+            <iidm:load id="CH" loadType="UNDEFINED" p0="-5.1022489999999996" q0="4.9081216000000003" bus="N_1" connectableBus="N_1" p="-5.1022489999999996" q="4.9081216000000003"/>
+            <iidm:load id="CE" loadType="UNDEFINED" p0="-72.186890000000005" q0="50.168945000000001" bus="N_3" connectableBus="N_3" p="-72.186890000000005" q="50.168945000000001"/>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="CI" r="2" x="14.744999999999999" g="0" b="3.1999999999999999e-05" ratedU1="225" ratedU2="225" bus1="C_0" connectableBus1="C_0" voltageLevelId1="C" bus2="N_1" connectableBus2="N_1" voltageLevelId2="N">
+            <iidm:phaseTapChanger lowTapPosition="0" tapPosition="22" regulationMode="CURRENT_LIMITER" regulationValue="930.66669999999999" regulating="false">
+                <iidm:terminalRef id="CI" side="ONE"/>
+                <iidm:step r="39.784730000000003" x="39.784725000000002" g="0" b="0" rho="1" alpha="-42.799999999999997"/>
+                <iidm:step r="31.720244999999998" x="31.720241999999999" g="0" b="0" rho="1" alpha="-40.18"/>
+                <iidm:step r="23.655736999999998" x="23.655735" g="0" b="0" rho="1" alpha="-37.539999999999999"/>
+                <iidm:step r="16.263271" x="16.263268" g="0" b="0" rho="1" alpha="-34.899999999999999"/>
+                <iidm:step r="9.5428470000000001" x="9.5428420000000003" g="0" b="0" rho="1" alpha="-32.259999999999998"/>
+                <iidm:step r="3.4944772999999998" x="3.4944772999999998" g="0" b="0" rho="1" alpha="-29.600000000000001"/>
+                <iidm:step r="-1.8818557" x="-1.8818527" g="0" b="0" rho="1" alpha="-26.940000000000001"/>
+                <iidm:step r="-7.2581949999999997" x="-7.2581954" g="0" b="0" rho="1" alpha="-24.260000000000002"/>
+                <iidm:step r="-11.962484999999999" x="-11.962484" g="0" b="0" rho="1" alpha="-21.579999999999998"/>
+                <iidm:step r="-15.994745" x="-15.994745" g="0" b="0" rho="1" alpha="-18.899999999999999"/>
+                <iidm:step r="-19.354952000000001" x="-19.354952000000001" g="0" b="0" rho="1" alpha="-16.219999999999999"/>
+                <iidm:step r="-22.043126999999998" x="-22.043129" g="0" b="0" rho="1" alpha="-13.52"/>
+                <iidm:step r="-24.731290000000001" x="-24.731286999999998" g="0" b="0" rho="1" alpha="-10.82"/>
+                <iidm:step r="-26.747416999999999" x="-26.747416999999999" g="0" b="0" rho="1" alpha="-8.1199999999999992"/>
+                <iidm:step r="-28.091502999999999" x="-28.091502999999999" g="0" b="0" rho="1" alpha="-5.4199999999999999"/>
+                <iidm:step r="-28.763538" x="-28.763535999999998" g="0" b="0" rho="1" alpha="-2.7000000000000002"/>
+                <iidm:step r="-28.763538" x="-28.763535999999998" g="0" b="0" rho="1" alpha="0"/>
+                <iidm:step r="-28.763538" x="-28.763535999999998" g="0" b="0" rho="1" alpha="2.7000000000000002"/>
+                <iidm:step r="-28.091502999999999" x="-28.091502999999999" g="0" b="0" rho="1" alpha="5.4199999999999999"/>
+                <iidm:step r="-26.747416999999999" x="-26.747416999999999" g="0" b="0" rho="1" alpha="8.1199999999999992"/>
+                <iidm:step r="-24.731290000000001" x="-24.731286999999998" g="0" b="0" rho="1" alpha="10.82"/>
+                <iidm:step r="-22.043126999999998" x="-22.043129" g="0" b="0" rho="1" alpha="13.52"/>
+                <iidm:step r="-19.354952000000001" x="-19.354952000000001" g="0" b="0" rho="1" alpha="16.219999999999999"/>
+                <iidm:step r="-15.994745" x="-15.994745" g="0" b="0" rho="1" alpha="18.899999999999999"/>
+                <iidm:step r="-11.962484999999999" x="-11.962484" g="0" b="0" rho="1" alpha="21.579999999999998"/>
+                <iidm:step r="-7.2581949999999997" x="-7.2581954" g="0" b="0" rho="1" alpha="24.260000000000002"/>
+                <iidm:step r="-1.8818557" x="-1.8818527" g="0" b="0" rho="1" alpha="26.940000000000001"/>
+                <iidm:step r="3.4944772999999998" x="3.4944772999999998" g="0" b="0" rho="1" alpha="29.600000000000001"/>
+                <iidm:step r="9.5428470000000001" x="9.5428420000000003" g="0" b="0" rho="1" alpha="32.259999999999998"/>
+                <iidm:step r="16.263271" x="16.263268" g="0" b="0" rho="1" alpha="34.899999999999999"/>
+                <iidm:step r="23.655736999999998" x="23.655735" g="0" b="0" rho="1" alpha="37.539999999999999"/>
+                <iidm:step r="31.720244999999998" x="31.720241999999999" g="0" b="0" rho="1" alpha="40.18"/>
+                <iidm:step r="39.784730000000003" x="39.784725000000002" g="0" b="0" rho="1" alpha="42.799999999999997"/>
+            </iidm:phaseTapChanger>
+            <iidm:currentLimits1 permanentLimit="931"/>
+            <iidm:currentLimits2 permanentLimit="931"/>
+        </iidm:twoWindingsTransformer>
+    </iidm:substation>
+    <iidm:line id="CJ" r="0.0099999990000000007" x="0.10000002400000001" g1="0" b1="0" g2="0" b2="0" bus1="C_0" connectableBus1="C_0" voltageLevelId1="C" bus2="N_3" connectableBus2="N_3" voltageLevelId2="N">
+        <iidm:currentLimits1 permanentLimit="931"/>
+        <iidm:currentLimits2 permanentLimit="931">
+            <iidm:temporaryLimit name="IST" value="1640" fictitious="true"/>
+            <iidm:temporaryLimit name="IT1" acceptableDuration="60"/>
+        </iidm:currentLimits2>
+    </iidm:line>
+</iidm:network>
diff --git a/test/resources/V1_5/fictitiousSwitchRef-bbr.xml b/test/resources/V1_5/fictitiousSwitchRef-bbr.xml
new file mode 100644
index 000000000..58486e8af
--- /dev/null
+++ b/test/resources/V1_5/fictitiousSwitchRef-bbr.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" id="fictitious" caseDate="2017-06-25T17:43:00+01:00" forecastDistance="0" sourceFormat="test">
+    <iidm:substation id="A" country="FR">
+        <iidm:voltageLevel id="C" nominalV="225" lowVoltageLimit="0" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="C_0" v="234.40912" angle="0"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="N" nominalV="225" lowVoltageLimit="220" highVoltageLimit="245.00002000000001" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="N_0" v="236.44736" angle="15.250391"/>
+                <iidm:bus id="N_3"/>
+            </iidm:busBreakerTopology>
+            <iidm:generator id="CB" energySource="HYDRO" minP="0" maxP="70" voltageRegulatorOn="false" targetP="0" targetV="0" targetQ="0" connectableBus="N_0">
+                <iidm:reactiveCapabilityCurve>
+                    <iidm:point p="0" minQ="-59.299999999999997" maxQ="60"/>
+                    <iidm:point p="70" minQ="-54.549999999999997" maxQ="46.25"/>
+                </iidm:reactiveCapabilityCurve>
+            </iidm:generator>
+            <iidm:generator id="CC" energySource="HYDRO" minP="0" maxP="80" voltageRegulatorOn="false" targetP="0" targetV="0" targetQ="0" connectableBus="N_0">
+                <iidm:reactiveCapabilityCurve>
+                    <iidm:point p="0" minQ="-56.799999999999997" maxQ="57.399999999999999"/>
+                    <iidm:point p="80" minQ="-53.514000000000003" maxQ="36.399999999999999"/>
+                </iidm:reactiveCapabilityCurve>
+            </iidm:generator>
+            <iidm:generator id="CD" energySource="HYDRO" minP="0" maxP="35" voltageRegulatorOn="true" targetP="21.789588999999999" targetV="236.44736" targetQ="-20.701546" bus="N_0" connectableBus="N_0" p="-21.789588999999999" q="20.693394000000001">
+                <iidm:reactiveCapabilityCurve>
+                    <iidm:point p="0" minQ="-20.600000000000001" maxQ="18.100000000000001"/>
+                    <iidm:point p="35" minQ="-21.725000000000001" maxQ="6.3500003999999999"/>
+                </iidm:reactiveCapabilityCurve>
+            </iidm:generator>
+            <iidm:load id="CF" loadType="UNDEFINED" p0="8.4558540000000004" q0="-23.695924999999999" bus="N_0" connectableBus="N_0" p="8.4558540000000004" q="-23.695924999999999"/>
+            <iidm:load id="CG" loadType="UNDEFINED" p0="90.399109999999993" q0="-51.968690000000002" bus="N_0" connectableBus="N_0" p="90.399109999999993" q="-51.968690000000002"/>
+            <iidm:load id="CH" loadType="UNDEFINED" p0="-5.1022489999999996" q0="4.9081216000000003" bus="N_0" connectableBus="N_0" p="-5.1022489999999996" q="4.9081216000000003"/>
+            <iidm:load id="CE" loadType="UNDEFINED" p0="-72.186890000000005" q0="50.168945000000001" bus="N_3" connectableBus="N_3" p="-72.186890000000005" q="50.168945000000001"/>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="CI" r="2" x="14.744999999999999" g="0" b="3.1999999999999999e-05" ratedU1="225" ratedU2="225" bus1="C_0" connectableBus1="C_0" voltageLevelId1="C" bus2="N_0" connectableBus2="N_0" voltageLevelId2="N">
+            <iidm:phaseTapChanger lowTapPosition="0" tapPosition="22" regulationMode="CURRENT_LIMITER" regulationValue="930.66669999999999" regulating="false">
+                <iidm:terminalRef id="CI" side="ONE"/>
+                <iidm:step r="39.784730000000003" x="39.784725000000002" g="0" b="0" rho="1" alpha="-42.799999999999997"/>
+                <iidm:step r="31.720244999999998" x="31.720241999999999" g="0" b="0" rho="1" alpha="-40.18"/>
+                <iidm:step r="23.655736999999998" x="23.655735" g="0" b="0" rho="1" alpha="-37.539999999999999"/>
+                <iidm:step r="16.263271" x="16.263268" g="0" b="0" rho="1" alpha="-34.899999999999999"/>
+                <iidm:step r="9.5428470000000001" x="9.5428420000000003" g="0" b="0" rho="1" alpha="-32.259999999999998"/>
+                <iidm:step r="3.4944772999999998" x="3.4944772999999998" g="0" b="0" rho="1" alpha="-29.600000000000001"/>
+                <iidm:step r="-1.8818557" x="-1.8818527" g="0" b="0" rho="1" alpha="-26.940000000000001"/>
+                <iidm:step r="-7.2581949999999997" x="-7.2581954" g="0" b="0" rho="1" alpha="-24.260000000000002"/>
+                <iidm:step r="-11.962484999999999" x="-11.962484" g="0" b="0" rho="1" alpha="-21.579999999999998"/>
+                <iidm:step r="-15.994745" x="-15.994745" g="0" b="0" rho="1" alpha="-18.899999999999999"/>
+                <iidm:step r="-19.354952000000001" x="-19.354952000000001" g="0" b="0" rho="1" alpha="-16.219999999999999"/>
+                <iidm:step r="-22.043126999999998" x="-22.043129" g="0" b="0" rho="1" alpha="-13.52"/>
+                <iidm:step r="-24.731290000000001" x="-24.731286999999998" g="0" b="0" rho="1" alpha="-10.82"/>
+                <iidm:step r="-26.747416999999999" x="-26.747416999999999" g="0" b="0" rho="1" alpha="-8.1199999999999992"/>
+                <iidm:step r="-28.091502999999999" x="-28.091502999999999" g="0" b="0" rho="1" alpha="-5.4199999999999999"/>
+                <iidm:step r="-28.763538" x="-28.763535999999998" g="0" b="0" rho="1" alpha="-2.7000000000000002"/>
+                <iidm:step r="-28.763538" x="-28.763535999999998" g="0" b="0" rho="1" alpha="0"/>
+                <iidm:step r="-28.763538" x="-28.763535999999998" g="0" b="0" rho="1" alpha="2.7000000000000002"/>
+                <iidm:step r="-28.091502999999999" x="-28.091502999999999" g="0" b="0" rho="1" alpha="5.4199999999999999"/>
+                <iidm:step r="-26.747416999999999" x="-26.747416999999999" g="0" b="0" rho="1" alpha="8.1199999999999992"/>
+                <iidm:step r="-24.731290000000001" x="-24.731286999999998" g="0" b="0" rho="1" alpha="10.82"/>
+                <iidm:step r="-22.043126999999998" x="-22.043129" g="0" b="0" rho="1" alpha="13.52"/>
+                <iidm:step r="-19.354952000000001" x="-19.354952000000001" g="0" b="0" rho="1" alpha="16.219999999999999"/>
+                <iidm:step r="-15.994745" x="-15.994745" g="0" b="0" rho="1" alpha="18.899999999999999"/>
+                <iidm:step r="-11.962484999999999" x="-11.962484" g="0" b="0" rho="1" alpha="21.579999999999998"/>
+                <iidm:step r="-7.2581949999999997" x="-7.2581954" g="0" b="0" rho="1" alpha="24.260000000000002"/>
+                <iidm:step r="-1.8818557" x="-1.8818527" g="0" b="0" rho="1" alpha="26.940000000000001"/>
+                <iidm:step r="3.4944772999999998" x="3.4944772999999998" g="0" b="0" rho="1" alpha="29.600000000000001"/>
+                <iidm:step r="9.5428470000000001" x="9.5428420000000003" g="0" b="0" rho="1" alpha="32.259999999999998"/>
+                <iidm:step r="16.263271" x="16.263268" g="0" b="0" rho="1" alpha="34.899999999999999"/>
+                <iidm:step r="23.655736999999998" x="23.655735" g="0" b="0" rho="1" alpha="37.539999999999999"/>
+                <iidm:step r="31.720244999999998" x="31.720241999999999" g="0" b="0" rho="1" alpha="40.18"/>
+                <iidm:step r="39.784730000000003" x="39.784725000000002" g="0" b="0" rho="1" alpha="42.799999999999997"/>
+            </iidm:phaseTapChanger>
+            <iidm:currentLimits1 permanentLimit="931"/>
+            <iidm:currentLimits2 permanentLimit="931"/>
+        </iidm:twoWindingsTransformer>
+    </iidm:substation>
+    <iidm:line id="CJ" r="0.0099999990000000007" x="0.10000002400000001" g1="0" b1="0" g2="0" b2="0" bus1="C_0" connectableBus1="C_0" voltageLevelId1="C" bus2="N_3" connectableBus2="N_3" voltageLevelId2="N">
+        <iidm:currentLimits1 permanentLimit="931"/>
+        <iidm:currentLimits2 permanentLimit="931">
+            <iidm:temporaryLimit name="IST" value="1640" fictitious="true"/>
+            <iidm:temporaryLimit name="IT1" acceptableDuration="60"/>
+        </iidm:currentLimits2>
+    </iidm:line>
+</iidm:network>
diff --git a/test/resources/V1_5/fictitiousSwitchRef.xml b/test/resources/V1_5/fictitiousSwitchRef.xml
new file mode 100644
index 000000000..77738e69a
--- /dev/null
+++ b/test/resources/V1_5/fictitiousSwitchRef.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" id="fictitious" caseDate="2017-06-25T17:43:00+01:00" forecastDistance="0" sourceFormat="test">
+    <iidm:substation id="A" country="FR">
+        <iidm:voltageLevel id="C" nominalV="225" lowVoltageLimit="0" topologyKind="NODE_BREAKER">
+            <iidm:nodeBreakerTopology>
+                <iidm:busbarSection id="D" name="E" node="0"/>
+                <iidm:switch id="F" name="G" fictitious="true" kind="DISCONNECTOR" retained="false" open="false" node1="0" node2="1"/>
+                <iidm:switch id="H" name="I" fictitious="true" kind="DISCONNECTOR" retained="false" open="false" node1="0" node2="3"/>
+                <iidm:switch id="J" name="K" fictitious="true" kind="BREAKER" retained="true" open="false" node1="1" node2="2"/>
+                <iidm:switch id="L" name="M" fictitious="true" kind="BREAKER" retained="true" open="false" node1="3" node2="4"/>
+                <iidm:bus v="234.40912" angle="0" nodes="0,1,2,3,4"/>
+            </iidm:nodeBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="N" nominalV="225" lowVoltageLimit="220" highVoltageLimit="245.00002000000001" topologyKind="NODE_BREAKER">
+            <iidm:nodeBreakerTopology>
+                <iidm:busbarSection id="O" name="E" node="0"/>
+                <iidm:busbarSection id="P" name="Q" node="1"/>
+                <iidm:switch id="R" name="S" kind="DISCONNECTOR" retained="false" open="true" node1="0" node2="19"/>
+                <iidm:switch id="T" name="U" kind="DISCONNECTOR" retained="false" open="true" node1="0" node2="17"/>
+                <iidm:switch id="V" name="W" kind="DISCONNECTOR" retained="false" open="true" node1="0" node2="21"/>
+                <iidm:switch id="X" name="Y" kind="DISCONNECTOR" retained="false" open="true" node1="0" node2="11"/>
+                <iidm:switch id="Z" name="AA" kind="DISCONNECTOR" retained="false" open="true" node1="0" node2="13"/>
+                <iidm:switch id="AB" name="AC" kind="DISCONNECTOR" retained="false" open="false" node1="0" node2="15"/>
+                <iidm:switch id="AD" name="AE" kind="DISCONNECTOR" retained="false" open="true" node1="0" node2="8"/>
+                <iidm:switch id="AF" name="AG" fictitious="true" kind="DISCONNECTOR" retained="false" open="true" node1="0" node2="2"/>
+                <iidm:switch id="AH" name="AI" kind="DISCONNECTOR" retained="false" open="false" node1="7" node2="0"/>
+                <iidm:switch id="AJ" name="AK" kind="DISCONNECTOR" retained="false" open="false" node1="1" node2="6"/>
+                <iidm:switch id="AL" name="AM" kind="DISCONNECTOR" retained="false" open="false" node1="1" node2="19"/>
+                <iidm:switch id="AN" name="AO" kind="DISCONNECTOR" retained="false" open="false" node1="1" node2="17"/>
+                <iidm:switch id="AP" name="AQ" kind="DISCONNECTOR" retained="false" open="false" node1="1" node2="21"/>
+                <iidm:switch id="AR" name="AS" kind="DISCONNECTOR" retained="false" open="true" node1="1" node2="11"/>
+                <iidm:switch id="AT" name="AU" kind="DISCONNECTOR" retained="false" open="true" node1="1" node2="13"/>
+                <iidm:switch id="AV" name="AW" kind="DISCONNECTOR" retained="false" open="true" node1="1" node2="15"/>
+                <iidm:switch id="AX" name="AY" kind="DISCONNECTOR" retained="false" open="false" node1="1" node2="8"/>
+                <iidm:switch id="AZ" name="BA" fictitious="true" kind="DISCONNECTOR" retained="false" open="true" node1="1" node2="2"/>
+                <iidm:switch id="BB" name="BC" fictitious="true" kind="BREAKER" retained="true" open="true" node1="2" node2="3"/>
+                <iidm:switch id="BD" name="BE" kind="BREAKER" retained="true" open="false" node1="3" node2="4"/>
+                <iidm:switch id="BF" name="BG" kind="DISCONNECTOR" retained="false" open="false" node1="3" node2="5"/>
+                <iidm:switch id="BH" name="BI" kind="DISCONNECTOR" retained="false" open="true" node1="9" node2="3"/>
+                <iidm:switch id="BJ" name="BK" kind="BREAKER" retained="true" open="false" node1="6" node2="7"/>
+                <iidm:switch id="BL" name="BM" kind="BREAKER" retained="true" open="false" node1="8" node2="9"/>
+                <iidm:switch id="BN" name="BO" kind="DISCONNECTOR" retained="false" open="false" node1="9" node2="10"/>
+                <iidm:switch id="BP" name="BQ" kind="BREAKER" retained="true" open="true" node1="11" node2="12"/>
+                <iidm:switch id="BR" name="BS" kind="BREAKER" retained="true" open="true" node1="13" node2="14"/>
+                <iidm:switch id="BT" name="BU" kind="BREAKER" retained="true" open="false" node1="15" node2="16"/>
+                <iidm:switch id="BV" name="BW" kind="BREAKER" retained="true" open="false" node1="17" node2="18"/>
+                <iidm:switch id="BX" name="BY" kind="BREAKER" retained="true" open="false" node1="19" node2="20"/>
+                <iidm:switch id="BZ" name="CA" kind="BREAKER" retained="true" open="false" node1="21" node2="22"/>
+                <iidm:bus v="236.44736" angle="15.250391" nodes="0,1,6,7,8,9,10,15,16,17,18,19,20,21,22"/>
+            </iidm:nodeBreakerTopology>
+            <iidm:generator id="CB" energySource="HYDRO" minP="0" maxP="70" voltageRegulatorOn="false" targetP="0" targetV="0" targetQ="0" node="12">
+                <iidm:reactiveCapabilityCurve>
+                    <iidm:point p="0" minQ="-59.299999999999997" maxQ="60"/>
+                    <iidm:point p="70" minQ="-54.549999999999997" maxQ="46.25"/>
+                </iidm:reactiveCapabilityCurve>
+            </iidm:generator>
+            <iidm:generator id="CC" energySource="HYDRO" minP="0" maxP="80" voltageRegulatorOn="false" targetP="0" targetV="0" targetQ="0" node="14">
+                <iidm:reactiveCapabilityCurve>
+                    <iidm:point p="0" minQ="-56.799999999999997" maxQ="57.399999999999999"/>
+                    <iidm:point p="80" minQ="-53.514000000000003" maxQ="36.399999999999999"/>
+                </iidm:reactiveCapabilityCurve>
+            </iidm:generator>
+            <iidm:generator id="CD" energySource="HYDRO" minP="0" maxP="35" voltageRegulatorOn="true" targetP="21.789588999999999" targetV="236.44736" targetQ="-20.701546" node="16" p="-21.789588999999999" q="20.693394000000001">
+                <iidm:reactiveCapabilityCurve>
+                    <iidm:point p="0" minQ="-20.600000000000001" maxQ="18.100000000000001"/>
+                    <iidm:point p="35" minQ="-21.725000000000001" maxQ="6.3500003999999999"/>
+                </iidm:reactiveCapabilityCurve>
+            </iidm:generator>
+            <iidm:load id="CE" loadType="UNDEFINED" p0="-72.186890000000005" q0="50.168945000000001" node="4" p="-72.186890000000005" q="50.168945000000001"/>
+            <iidm:load id="CF" loadType="UNDEFINED" p0="8.4558540000000004" q0="-23.695924999999999" node="18" p="8.4558540000000004" q="-23.695924999999999"/>
+            <iidm:load id="CG" loadType="UNDEFINED" p0="90.399109999999993" q0="-51.968690000000002" node="20" p="90.399109999999993" q="-51.968690000000002"/>
+            <iidm:load id="CH" loadType="UNDEFINED" p0="-5.1022489999999996" q0="4.9081216000000003" node="22" p="-5.1022489999999996" q="4.9081216000000003"/>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="CI" r="2" x="14.744999999999999" g="0" b="3.1999999999999999e-05" ratedU1="225" ratedU2="225" ratedS="1" node1="2" voltageLevelId1="C" node2="10" voltageLevelId2="N">
+            <iidm:phaseTapChanger lowTapPosition="0" tapPosition="22" regulationMode="CURRENT_LIMITER" regulationValue="930.66669999999999" regulating="false">
+                <iidm:terminalRef id="CI" side="ONE"/>
+                <iidm:step r="39.784730000000003" x="39.784725000000002" g="0" b="0" rho="1" alpha="-42.799999999999997"/>
+                <iidm:step r="31.720244999999998" x="31.720241999999999" g="0" b="0" rho="1" alpha="-40.18"/>
+                <iidm:step r="23.655736999999998" x="23.655735" g="0" b="0" rho="1" alpha="-37.539999999999999"/>
+                <iidm:step r="16.263271" x="16.263268" g="0" b="0" rho="1" alpha="-34.899999999999999"/>
+                <iidm:step r="9.5428470000000001" x="9.5428420000000003" g="0" b="0" rho="1" alpha="-32.259999999999998"/>
+                <iidm:step r="3.4944772999999998" x="3.4944772999999998" g="0" b="0" rho="1" alpha="-29.600000000000001"/>
+                <iidm:step r="-1.8818557" x="-1.8818527" g="0" b="0" rho="1" alpha="-26.940000000000001"/>
+                <iidm:step r="-7.2581949999999997" x="-7.2581954" g="0" b="0" rho="1" alpha="-24.260000000000002"/>
+                <iidm:step r="-11.962484999999999" x="-11.962484" g="0" b="0" rho="1" alpha="-21.579999999999998"/>
+                <iidm:step r="-15.994745" x="-15.994745" g="0" b="0" rho="1" alpha="-18.899999999999999"/>
+                <iidm:step r="-19.354952000000001" x="-19.354952000000001" g="0" b="0" rho="1" alpha="-16.219999999999999"/>
+                <iidm:step r="-22.043126999999998" x="-22.043129" g="0" b="0" rho="1" alpha="-13.52"/>
+                <iidm:step r="-24.731290000000001" x="-24.731286999999998" g="0" b="0" rho="1" alpha="-10.82"/>
+                <iidm:step r="-26.747416999999999" x="-26.747416999999999" g="0" b="0" rho="1" alpha="-8.1199999999999992"/>
+                <iidm:step r="-28.091502999999999" x="-28.091502999999999" g="0" b="0" rho="1" alpha="-5.4199999999999999"/>
+                <iidm:step r="-28.763538" x="-28.763535999999998" g="0" b="0" rho="1" alpha="-2.7000000000000002"/>
+                <iidm:step r="-28.763538" x="-28.763535999999998" g="0" b="0" rho="1" alpha="0"/>
+                <iidm:step r="-28.763538" x="-28.763535999999998" g="0" b="0" rho="1" alpha="2.7000000000000002"/>
+                <iidm:step r="-28.091502999999999" x="-28.091502999999999" g="0" b="0" rho="1" alpha="5.4199999999999999"/>
+                <iidm:step r="-26.747416999999999" x="-26.747416999999999" g="0" b="0" rho="1" alpha="8.1199999999999992"/>
+                <iidm:step r="-24.731290000000001" x="-24.731286999999998" g="0" b="0" rho="1" alpha="10.82"/>
+                <iidm:step r="-22.043126999999998" x="-22.043129" g="0" b="0" rho="1" alpha="13.52"/>
+                <iidm:step r="-19.354952000000001" x="-19.354952000000001" g="0" b="0" rho="1" alpha="16.219999999999999"/>
+                <iidm:step r="-15.994745" x="-15.994745" g="0" b="0" rho="1" alpha="18.899999999999999"/>
+                <iidm:step r="-11.962484999999999" x="-11.962484" g="0" b="0" rho="1" alpha="21.579999999999998"/>
+                <iidm:step r="-7.2581949999999997" x="-7.2581954" g="0" b="0" rho="1" alpha="24.260000000000002"/>
+                <iidm:step r="-1.8818557" x="-1.8818527" g="0" b="0" rho="1" alpha="26.940000000000001"/>
+                <iidm:step r="3.4944772999999998" x="3.4944772999999998" g="0" b="0" rho="1" alpha="29.600000000000001"/>
+                <iidm:step r="9.5428470000000001" x="9.5428420000000003" g="0" b="0" rho="1" alpha="32.259999999999998"/>
+                <iidm:step r="16.263271" x="16.263268" g="0" b="0" rho="1" alpha="34.899999999999999"/>
+                <iidm:step r="23.655736999999998" x="23.655735" g="0" b="0" rho="1" alpha="37.539999999999999"/>
+                <iidm:step r="31.720244999999998" x="31.720241999999999" g="0" b="0" rho="1" alpha="40.18"/>
+                <iidm:step r="39.784730000000003" x="39.784725000000002" g="0" b="0" rho="1" alpha="42.799999999999997"/>
+            </iidm:phaseTapChanger>
+            <iidm:currentLimits1 permanentLimit="931"/>
+            <iidm:currentLimits2 permanentLimit="931"/>
+        </iidm:twoWindingsTransformer>
+    </iidm:substation>
+    <iidm:line id="CJ" r="0.0099999990000000007" x="0.10000002400000001" g1="0" b1="0" g2="0" b2="0" node1="4" voltageLevelId1="C" node2="5" voltageLevelId2="N">
+        <iidm:currentLimits1 permanentLimit="931"/>
+        <iidm:currentLimits2 permanentLimit="931">
+            <iidm:temporaryLimit name="IST" value="1640" fictitious="true"/>
+            <iidm:temporaryLimit name="IT1" acceptableDuration="60"/>
+        </iidm:currentLimits2>
+    </iidm:line>
+</iidm:network>
diff --git a/test/resources/V1_5/fourSubstationsNbk.xml b/test/resources/V1_5/fourSubstationsNbk.xml
new file mode 100644
index 000000000..80f56069e
--- /dev/null
+++ b/test/resources/V1_5/fourSubstationsNbk.xml
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" id="fourSubstations" caseDate="2017-06-25T17:43:00+01:00" forecastDistance="0" sourceFormat="test">
+    <iidm:substation id="S1">
+        <iidm:voltageLevel id="S1VL1" nominalV="225" lowVoltageLimit="220" highVoltageLimit="240" topologyKind="NODE_BREAKER">
+            <iidm:nodeBreakerTopology>
+                <iidm:busbarSection id="S1VL1_BBS" name="S1VL1_BBS" node="0"/>
+                <iidm:switch id="S1VL1_BBS_LD1_DISCONNECTOR" name="S1VL1_BBS_LD1_DISCONNECTOR" kind="DISCONNECTOR" retained="false" open="false" node1="0" node2="1"/>
+                <iidm:switch id="S1VL1_LD1_BREAKER" name="S1VL1_LD1_BREAKER" kind="BREAKER" retained="true" open="false" node1="1" node2="2"/>
+                <iidm:switch id="S1VL1_BBS_TWT_DISCONNECTOR" name="S1VL1_BBS_TWT_DISCONNECTOR" kind="DISCONNECTOR" retained="false" open="false" node1="0" node2="3"/>
+                <iidm:switch id="S1VL1_TWT_BREAKER" name="S1VL1_TWT_BREAKER" kind="BREAKER" retained="true" open="false" node1="3" node2="4"/>
+                <iidm:bus v="224.6139" angle="2.2822" nodes="0,1,2,3,4"/>
+            </iidm:nodeBreakerTopology>
+            <iidm:load id="LD1" loadType="UNDEFINED" p0="80" q0="10" node="2" p="80" q="10"/>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="S1VL2" nominalV="400" lowVoltageLimit="390" highVoltageLimit="440" topologyKind="NODE_BREAKER">
+            <iidm:nodeBreakerTopology>
+                <iidm:busbarSection id="S1VL2_BBS1" name="S1VL2_BBS1" node="0"/>
+                <iidm:busbarSection id="S1VL2_BBS2" name="S1VL2_BBS2" node="1"/>
+                <iidm:switch id="S1VL2_BBS1_TWT_DISCONNECTOR" name="S1VL2_BBS1_TWT_DISCONNECTOR" kind="DISCONNECTOR" retained="false" open="false" node1="0" node2="2"/>
+                <iidm:switch id="S1VL2_BBS2_TWT_DISCONNECTOR" name="S1VL2_BBS2_TWT_DISCONNECTOR" kind="DISCONNECTOR" retained="false" open="true" node1="1" node2="2"/>
+                <iidm:switch id="S1VL2_TWT_BREAKER" name="S1VL2_TWT_BREAKER" kind="BREAKER" retained="true" open="false" node1="2" node2="3"/>
+                <iidm:switch id="S1VL2_BBS1_VSC1_DISCONNECTOR" name="S1VL2_BBS1_VSC1_DISCONNECTOR" kind="DISCONNECTOR" retained="false" open="true" node1="0" node2="4"/>
+                <iidm:switch id="S1VL2_BBS2_VSC1_DISCONNECTOR" name="S1VL2_BBS2_VSC1_DISCONNECTOR" kind="DISCONNECTOR" retained="false" open="false" node1="1" node2="4"/>
+                <iidm:switch id="S1VL2_VSC1_BREAKER" name="S1VL2_VSC1_BREAKER" kind="BREAKER" retained="true" open="false" node1="4" node2="5"/>
+                <iidm:switch id="S1VL2_BBS1_GH1_DISCONNECTOR" name="S1VL2_BBS1_GH1_DISCONNECTOR" kind="DISCONNECTOR" retained="false" open="false" node1="0" node2="6"/>
+                <iidm:switch id="S1VL2_BBS1_GH2_DISCONNECTOR" name="S1VL2_BBS1_GH2_DISCONNECTOR" kind="DISCONNECTOR" retained="false" open="false" node1="0" node2="8"/>
+                <iidm:switch id="S1VL2_BBS1_GH3_DISCONNECTOR" name="S1VL2_BBS1_GH3_DISCONNECTOR" kind="DISCONNECTOR" retained="false" open="false" node1="0" node2="10"/>
+                <iidm:switch id="S1VL2_BBS2_GH1_DISCONNECTOR" name="S1VL2_BBS2_GH1_DISCONNECTOR" kind="DISCONNECTOR" retained="false" open="true" node1="1" node2="6"/>
+                <iidm:switch id="S1VL2_BBS2_GH2_DISCONNECTOR" name="S1VL2_BBS2_GH2_DISCONNECTOR" kind="DISCONNECTOR" retained="false" open="true" node1="1" node2="8"/>
+                <iidm:switch id="S1VL2_BBS2_GH3_DISCONNECTOR" name="S1VL2_BBS2_GH3_DISCONNECTOR" kind="DISCONNECTOR" retained="false" open="true" node1="1" node2="10"/>
+                <iidm:switch id="S1VL2_GH1_BREAKER" name="S1VL2_GH1_BREAKER" kind="BREAKER" retained="true" open="false" node1="6" node2="7"/>
+                <iidm:switch id="S1VL2_GH2_BREAKER" name="S1VL2_GH2_BREAKER" kind="BREAKER" retained="true" open="false" node1="8" node2="9"/>
+                <iidm:switch id="S1VL2_GH3_BREAKER" name="S1VL2_GH3_BREAKER" kind="BREAKER" retained="true" open="false" node1="10" node2="11"/>
+                <iidm:switch id="S1VL2_BBS1_LD2_DISCONNECTOR" name="S1VL2_BBS1_LD2_DISCONNECTOR" kind="DISCONNECTOR" retained="false" open="true" node1="0" node2="12"/>
+                <iidm:switch id="S1VL2_BBS1_LD3_DISCONNECTOR" name="S1VL2_BBS1_LD3_DISCONNECTOR" kind="DISCONNECTOR" retained="false" open="true" node1="0" node2="14"/>
+                <iidm:switch id="S1VL2_BBS1_LD4_DISCONNECTOR" name="S1VL2_BBS1_LD4_DISCONNECTOR" kind="DISCONNECTOR" retained="false" open="true" node1="0" node2="16"/>
+                <iidm:switch id="S1VL2_BBS2_LD2_DISCONNECTOR" name="S1VL2_BBS2_LD2_DISCONNECTOR" kind="DISCONNECTOR" retained="false" open="false" node1="1" node2="12"/>
+                <iidm:switch id="S1VL2_BBS2_LD3_DISCONNECTOR" name="S1VL2_BBS2_LD3_DISCONNECTOR" kind="DISCONNECTOR" retained="false" open="false" node1="1" node2="14"/>
+                <iidm:switch id="S1VL2_BBS2_LD4_DISCONNECTOR" name="S1VL2_BBS2_LD4_DISCONNECTOR" kind="DISCONNECTOR" retained="false" open="false" node1="1" node2="16"/>
+                <iidm:switch id="S1VL2_LD2_BREAKER" name="S1VL2_LD2_BREAKER" kind="BREAKER" retained="true" open="false" node1="12" node2="13"/>
+                <iidm:switch id="S1VL2_LD3_BREAKER" name="S1VL2_LD3_BREAKER" kind="BREAKER" retained="true" open="false" node1="14" node2="15"/>
+                <iidm:switch id="S1VL2_LD4_BREAKER" name="S1VL2_LD4_BREAKER" kind="BREAKER" retained="true" open="false" node1="16" node2="17"/>
+                <iidm:switch id="S1VL2_BBS1_SHUNT_DISCONNECTOR" name="S1VL2_BBS1_SHUNT_DISCONNECTOR" kind="DISCONNECTOR" retained="false" open="false" node1="0" node2="18"/>
+                <iidm:switch id="S1VL2_BBS2_SHUNT_DISCONNECTOR" name="S1VL2_BBS2_SHUNT_DISCONNECTOR" kind="DISCONNECTOR" retained="false" open="true" node1="1" node2="18"/>
+                <iidm:switch id="S1VL2_SHUNT_BREAKER" name="S1VL2_SHUNT_BREAKER" kind="BREAKER" retained="true" open="false" node1="18" node2="19"/>
+                <iidm:switch id="S1VL2_BBS1_LCC1_DISCONNECTOR" name="S1VL2_BBS1_LCC1_DISCONNECTOR" kind="DISCONNECTOR" retained="false" open="true" node1="0" node2="20"/>
+                <iidm:switch id="S1VL2_BBS2_LCC1_DISCONNECTOR" name="S1VL2_BBS2_LCC1_DISCONNECTOR" kind="DISCONNECTOR" retained="false" open="false" node1="1" node2="20"/>
+                <iidm:switch id="S1VL2_LCC1_BREAKER" name="S1VL2_LCC1_BREAKER" kind="BREAKER" retained="true" open="false" node1="20" node2="21"/>
+                <iidm:switch id="S1VL2_BBS1_COUPLER_DISCONNECTOR" name="S1VL2_BBS1_COUPLER_DISCONNECTOR" kind="DISCONNECTOR" retained="false" open="false" node1="0" node2="22"/>
+                <iidm:switch id="S1VL2_BBS2_COUPLER_DISCONNECTOR" name="S1VL2_BBS2_COUPLER_DISCONNECTOR" kind="DISCONNECTOR" retained="false" open="false" node1="1" node2="23"/>
+                <iidm:switch id="S1VL2_COUPLER" name="S1VL2_COUPLER" kind="BREAKER" retained="true" open="false" node1="22" node2="23"/>
+                <iidm:bus v="400" angle="0" nodes="0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23"/>
+            </iidm:nodeBreakerTopology>
+            <iidm:generator id="GH1" energySource="HYDRO" minP="0" maxP="100" voltageRegulatorOn="true" targetP="85.356999999999999" targetV="400" targetQ="512.08100000000002" node="7" p="-85.356999999999999" q="-512.08140000000003">
+                <iidm:reactiveCapabilityCurve>
+                    <iidm:point p="0" minQ="-769.29999999999995" maxQ="860"/>
+                    <iidm:point p="100" minQ="-864.54999999999995" maxQ="946.25"/>
+                </iidm:reactiveCapabilityCurve>
+            </iidm:generator>
+            <iidm:generator id="GH2" energySource="HYDRO" minP="0" maxP="200" voltageRegulatorOn="true" targetP="90" targetV="400" targetQ="512.08100000000002" node="9" p="-90" q="-512.08140000000003">
+                <iidm:reactiveCapabilityCurve>
+                    <iidm:point p="0" minQ="-556.79999999999995" maxQ="557.39999999999998"/>
+                    <iidm:point p="200" minQ="-553.51400000000001" maxQ="536.39999999999998"/>
+                </iidm:reactiveCapabilityCurve>
+            </iidm:generator>
+            <iidm:generator id="GH3" energySource="HYDRO" minP="0" maxP="200" voltageRegulatorOn="true" targetP="155.714" targetV="400" targetQ="512.08100000000002" node="11" p="-155.714" q="-512.08140000000003">
+                <iidm:reactiveCapabilityCurve>
+                    <iidm:point p="0" minQ="-680.60000000000002" maxQ="688.10000000000002"/>
+                    <iidm:point p="200" minQ="-681.72500000000002" maxQ="716.3500004"/>
+                </iidm:reactiveCapabilityCurve>
+            </iidm:generator>
+            <iidm:load id="LD2" loadType="UNDEFINED" p0="60" q0="5" node="13" p="60" q="5"/>
+            <iidm:load id="LD3" loadType="UNDEFINED" p0="60" q0="5" node="15" p="60" q="5"/>
+            <iidm:load id="LD4" loadType="UNDEFINED" p0="40" q0="5" node="17" p="40" q="5"/>
+            <iidm:shunt id="SHUNT" sectionCount="1" voltageRegulatorOn="false" node="19" q="1920">
+                <iidm:shuntLinearModel bPerSection="-0.012" maximumSectionCount="1"/>
+            </iidm:shunt>
+            <iidm:vscConverterStation id="VSC1" name="VSC1" voltageRegulatorOn="true" lossFactor="1.1000000000000001" voltageSetpoint="400" reactivePowerSetpoint="500" node="5" p="10.109999999999999" q="-512.08140000000003">
+                <iidm:reactiveCapabilityCurve>
+                    <iidm:point p="-100" minQ="-550" maxQ="570"/>
+                    <iidm:point p="100" minQ="-550" maxQ="570"/>
+                </iidm:reactiveCapabilityCurve>
+            </iidm:vscConverterStation>
+            <iidm:lccConverterStation id="LCC1" name="LCC1" lossFactor="1.1000000000000001" powerFactor="0.59999999999999998" node="21" p="80.879999999999995"/>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="TWT" r="2" x="14.744999999999999" g="0" b="3.1999999999999999e-05" ratedU1="225" ratedU2="400" node1="4" voltageLevelId1="S1VL1" node2="3" voltageLevelId2="S1VL2" p1="-80" q1="-10" p2="80.0809" q2="5.4856999999999996">
+            <iidm:phaseTapChanger lowTapPosition="0" tapPosition="15" regulationMode="FIXED_TAP">
+                <iidm:terminalRef id="TWT" side="ONE"/>
+                <iidm:step r="39.784730000000003" x="29.784725000000002" g="0" b="0" rho="1" alpha="-42.799999999999997"/>
+                <iidm:step r="31.720244999999998" x="21.720241999999999" g="0" b="0" rho="1" alpha="-40.18"/>
+                <iidm:step r="23.655736999999998" x="13.655735" g="0" b="0" rho="1" alpha="-37.539999999999999"/>
+                <iidm:step r="16.263271" x="6.2632680000000001" g="0" b="0" rho="1" alpha="-34.899999999999999"/>
+                <iidm:step r="9.5428470000000001" x="4.5428420000000003" g="0" b="0" rho="1" alpha="-32.259999999999998"/>
+                <iidm:step r="3.4944772999999998" x="3.4944772999999998" g="0" b="0" rho="1" alpha="-29.600000000000001"/>
+                <iidm:step r="-1.8818557" x="-1.8818527" g="0" b="0" rho="1" alpha="-26.940000000000001"/>
+                <iidm:step r="-7.2581949999999997" x="-3.2581954" g="0" b="0" rho="1" alpha="-24.260000000000002"/>
+                <iidm:step r="-11.962484999999999" x="-7.9624839999999999" g="0" b="0" rho="1" alpha="-21.579999999999998"/>
+                <iidm:step r="-15.994745" x="-11.994745" g="0" b="0" rho="1" alpha="-18.899999999999999"/>
+                <iidm:step r="-19.354952000000001" x="-15.354952000000001" g="0" b="0" rho="1" alpha="-16.219999999999999"/>
+                <iidm:step r="-22.043126999999998" x="-22.043129" g="0" b="0" rho="1" alpha="-13.52"/>
+                <iidm:step r="-24.731290000000001" x="-24.731286999999998" g="0" b="0" rho="1" alpha="-10.82"/>
+                <iidm:step r="-26.747416999999999" x="-26.747416999999999" g="0" b="0" rho="1" alpha="-8.1199999999999992"/>
+                <iidm:step r="-28.091502999999999" x="-28.091502999999999" g="0" b="0" rho="1" alpha="-5.4199999999999999"/>
+                <iidm:step r="-28.763538" x="-28.763535999999998" g="0" b="0" rho="1" alpha="-2.7000000000000002"/>
+                <iidm:step r="-28.763538" x="-28.763535999999998" g="0" b="0" rho="1" alpha="0"/>
+                <iidm:step r="-28.763538" x="-28.763535999999998" g="0" b="0" rho="1" alpha="2.7000000000000002"/>
+                <iidm:step r="-28.091502999999999" x="-28.091502999999999" g="0" b="0" rho="1" alpha="5.4199999999999999"/>
+                <iidm:step r="-26.747416999999999" x="-26.747416999999999" g="0" b="0" rho="1" alpha="8.1199999999999992"/>
+                <iidm:step r="-24.731290000000001" x="-24.731286999999998" g="0" b="0" rho="1" alpha="10.82"/>
+                <iidm:step r="-22.043126999999998" x="-22.043129" g="0" b="0" rho="1" alpha="13.52"/>
+                <iidm:step r="-19.354952000000001" x="-19.354952000000001" g="0" b="0" rho="1" alpha="16.219999999999999"/>
+                <iidm:step r="-15.994745" x="-15.994745" g="0" b="0" rho="1" alpha="18.899999999999999"/>
+                <iidm:step r="-11.962484999999999" x="-11.962484" g="0" b="0" rho="1" alpha="21.579999999999998"/>
+                <iidm:step r="-7.2581949999999997" x="-7.2581954" g="0" b="0" rho="1" alpha="24.260000000000002"/>
+                <iidm:step r="-1.8818557" x="-1.8818527" g="0" b="0" rho="1" alpha="26.940000000000001"/>
+                <iidm:step r="3.4944772999999998" x="3.4944772999999998" g="0" b="0" rho="1" alpha="29.600000000000001"/>
+                <iidm:step r="9.5428470000000001" x="9.5428420000000003" g="0" b="0" rho="1" alpha="32.259999999999998"/>
+                <iidm:step r="16.263271" x="16.263268" g="0" b="0" rho="1" alpha="34.899999999999999"/>
+                <iidm:step r="23.655736999999998" x="23.655735" g="0" b="0" rho="1" alpha="37.539999999999999"/>
+                <iidm:step r="31.720244999999998" x="31.720241999999999" g="0" b="0" rho="1" alpha="40.18"/>
+                <iidm:step r="39.784730000000003" x="39.784725000000002" g="0" b="0" rho="1" alpha="42.799999999999997"/>
+            </iidm:phaseTapChanger>
+            <iidm:currentLimits1 permanentLimit="1031"/>
+            <iidm:currentLimits2 permanentLimit="1031"/>
+        </iidm:twoWindingsTransformer>
+    </iidm:substation>
+    <iidm:substation id="S2">
+        <iidm:voltageLevel id="S2VL1" nominalV="400" lowVoltageLimit="390" highVoltageLimit="440" topologyKind="NODE_BREAKER">
+            <iidm:nodeBreakerTopology>
+                <iidm:busbarSection id="S2VL1_BBS" name="S2VL1_BBS" node="0"/>
+                <iidm:switch id="S2VL1_BBS_GTH1_DISCONNECTOR" name="S2VL1_BBS_GTH1_DISCONNECTOR" kind="DISCONNECTOR" retained="false" open="false" node1="0" node2="1"/>
+                <iidm:switch id="S2VL1_GTH1_BREAKER" name="S2VL1_GTH1_BREAKER" kind="BREAKER" retained="true" open="false" node1="1" node2="2"/>
+                <iidm:switch id="S2VL1_BBS_VSC2_DISCONNECTOR" name="S2VL1_BBS_VSC2_DISCONNECTOR" kind="DISCONNECTOR" retained="false" open="false" node1="0" node2="3"/>
+                <iidm:switch id="S2VL1_VSC2_BREAKER" name="S2VL1_VSC2_BREAKER" kind="BREAKER" retained="true" open="false" node1="3" node2="4"/>
+                <iidm:switch id="S2VL1_BBS_LINES2S3_DISCONNECTOR" name="S2VL1_BBS_LINES2S3_DISCONNECTOR" kind="DISCONNECTOR" retained="false" open="false" node1="0" node2="5"/>
+                <iidm:switch id="S2VL1_LINES2S3_BREAKER" name="S2VL1_LINES2S3_BREAKER" kind="BREAKER" retained="true" open="false" node1="5" node2="6"/>
+                <iidm:bus v="408.84699999999998" angle="0.73470000000000002" nodes="0,1,2,3,4,5,6"/>
+            </iidm:nodeBreakerTopology>
+            <iidm:generator id="GTH1" energySource="THERMAL" minP="0" maxP="100" voltageRegulatorOn="false" targetP="100" targetV="400" targetQ="70" node="2" p="-100" q="-70">
+                <iidm:reactiveCapabilityCurve>
+                    <iidm:point p="0" minQ="-76.799999999999997" maxQ="77.400000000000006"/>
+                    <iidm:point p="100" minQ="-73.513999999999996" maxQ="76.400000000000006"/>
+                </iidm:reactiveCapabilityCurve>
+            </iidm:generator>
+            <iidm:vscConverterStation id="VSC2" name="VSC2" voltageRegulatorOn="false" lossFactor="1.1000000000000001" voltageSetpoint="0" reactivePowerSetpoint="120" node="4" p="-9.8900000000000006" q="-120">
+                <iidm:minMaxReactiveLimits minQ="-400" maxQ="500"/>
+            </iidm:vscConverterStation>
+        </iidm:voltageLevel>
+    </iidm:substation>
+    <iidm:substation id="S3">
+        <iidm:voltageLevel id="S3VL1" nominalV="400" lowVoltageLimit="390" highVoltageLimit="440" topologyKind="NODE_BREAKER">
+            <iidm:nodeBreakerTopology>
+                <iidm:busbarSection id="S3VL1_BBS" name="S3VL1_BBS" node="0"/>
+                <iidm:switch id="S3VL1_BBS_LINES2S3_DISCONNECTOR" name="S3VL1_BBS_LINES2S3_DISCONNECTOR" kind="DISCONNECTOR" retained="false" open="false" node1="0" node2="1"/>
+                <iidm:switch id="S3VL1_LINES2S3_BREAKER" name="S3VL1_LINES2S3_BREAKER" kind="BREAKER" retained="true" open="false" node1="1" node2="2"/>
+                <iidm:switch id="S3VL1_BBS_LD5_DISCONNECTOR" name="S3VL1_BBS_LD5_DISCONNECTOR" kind="DISCONNECTOR" retained="false" open="false" node1="0" node2="3"/>
+                <iidm:switch id="S3VL1_LD5_BREAKER" name="S3VL1_LD5_BREAKER" kind="BREAKER" retained="true" open="false" node1="3" node2="4"/>
+                <iidm:switch id="S3VL1_BBS_GTH2_DISCONNECTOR" name="S3VL1_BBS_GTH2_DISCONNECTOR" kind="DISCONNECTOR" retained="false" open="false" node1="0" node2="5"/>
+                <iidm:switch id="S3VL1_GTH2_BREAKER" name="S3VL1_GTH2_BREAKER" kind="BREAKER" retained="true" open="false" node1="5" node2="6"/>
+                <iidm:switch id="S3VL1_BBS_LINES3S4_DISCONNECTOR" name="S3VL1_BBS_LINES3S4_DISCONNECTOR" kind="DISCONNECTOR" retained="false" open="false" node1="0" node2="7"/>
+                <iidm:switch id="S3VL1_LINES3S4_BREAKER" name="S3VL1_LINES3S4_BREAKER" kind="BREAKER" retained="true" open="false" node1="7" node2="8"/>
+                <iidm:switch id="S3VL1_BBS_LCC2_DISCONNECTOR" name="S3VL1_BBS_LCC2_DISCONNECTOR" kind="DISCONNECTOR" retained="false" open="false" node1="0" node2="9"/>
+                <iidm:switch id="S3VL1_LCC2_BREAKER" name="S3VL1_LCC2_BREAKER" kind="BREAKER" retained="true" open="false" node1="9" node2="10"/>
+                <iidm:bus v="400" angle="0" nodes="0,1,2,3,4,5,6,7,8,9,10"/>
+            </iidm:nodeBreakerTopology>
+            <iidm:generator id="GTH2" energySource="THERMAL" minP="0" maxP="400" voltageRegulatorOn="true" targetP="250.99440000000001" targetV="400" targetQ="71.848699999999994" node="6" p="-250.99440000000001" q="71.848699999999994">
+                <iidm:reactiveCapabilityCurve>
+                    <iidm:point p="0" minQ="-169.30000000000001" maxQ="200"/>
+                    <iidm:point p="400" minQ="-174.55000000000001" maxQ="176.25"/>
+                </iidm:reactiveCapabilityCurve>
+            </iidm:generator>
+            <iidm:load id="LD5" loadType="UNDEFINED" p0="200" q0="5" node="4" p="200" q="5"/>
+            <iidm:lccConverterStation id="LCC2" name="LCC2" lossFactor="1.1000000000000001" powerFactor="0.59999999999999998" node="10" p="-79.120000000000005"/>
+        </iidm:voltageLevel>
+    </iidm:substation>
+    <iidm:substation id="S4">
+        <iidm:voltageLevel id="S4VL1" nominalV="400" lowVoltageLimit="390" highVoltageLimit="440" topologyKind="NODE_BREAKER">
+            <iidm:nodeBreakerTopology>
+                <iidm:busbarSection id="S4VL1_BBS" name="S4VL1_BBS" node="0"/>
+                <iidm:switch id="S4VL1_BBS_LINES3S4_DISCONNECTOR" name="S4VL1_BBS_LINES3S4_DISCONNECTOR" kind="DISCONNECTOR" retained="false" open="false" node1="0" node2="5"/>
+                <iidm:switch id="S4VL1_LINES3S4_BREAKER" name="S4VL1_LINES3S4_BREAKER" kind="BREAKER" retained="true" open="false" node1="5" node2="6"/>
+                <iidm:switch id="S4VL1_BBS_LD6_DISCONNECTOR" name="S4VL1_BBS_LD6_DISCONNECTOR" kind="DISCONNECTOR" retained="false" open="false" node1="0" node2="1"/>
+                <iidm:switch id="S4VL1_LD6_BREAKER" name="S4VL1_LD6_BREAKER" kind="BREAKER" retained="true" open="false" node1="1" node2="2"/>
+                <iidm:switch id="S4VL1_BBS_SVC_DISCONNECTOR" name="S4VL1_BBS_SVC_DISCONNECTOR" kind="DISCONNECTOR" retained="false" open="false" node1="0" node2="3"/>
+                <iidm:switch id="S4VL1_SVC_BREAKER" name="S4VL1_SVC_BREAKER" kind="BREAKER" retained="true" open="false" node1="3" node2="4"/>
+                <iidm:bus v="400" angle="-1.1258999999999999" nodes="0,1,2,3,4,5,6"/>
+            </iidm:nodeBreakerTopology>
+            <iidm:load id="LD6" loadType="UNDEFINED" p0="240" q0="10" node="2" p="240" q="10"/>
+            <iidm:staticVarCompensator id="SVC" bMin="-0.050000000000000003" bMax="0.050000000000000003" voltageSetpoint="400" regulationMode="VOLTAGE" node="4" q="-12.541499999999999"/>
+        </iidm:voltageLevel>
+    </iidm:substation>
+    <iidm:line id="LINE_S2S3" r="0.0099999990000000007" x="19.100000024" g1="0" b1="0" g2="0" b2="0" node1="6" voltageLevelId1="S2VL1" node2="2" voltageLevelId2="S3VL1" p1="109.88930000000001" q1="190.02289999999999" p2="-109.88639999999999" q2="-184.5171"/>
+    <iidm:line id="LINE_S3S4" r="0.0099999990000000007" x="13.100000024" g1="0" b1="0" g2="0" b2="0" node1="8" voltageLevelId1="S3VL1" node2="6" voltageLevelId2="S4VL1" p1="240.00360000000001" q1="2.1751" p2="-240" q2="2.5415000000000001">
+        <iidm:currentLimits1 permanentLimit="931"/>
+        <iidm:currentLimits2 permanentLimit="931">
+            <iidm:temporaryLimit name="IST" value="1640" fictitious="true"/>
+            <iidm:temporaryLimit name="LD71" acceptableDuration="60"/>
+        </iidm:currentLimits2>
+    </iidm:line>
+    <iidm:hvdcLine id="HVDC1" name="HVDC1" r="1" nominalV="400" convertersMode="SIDE_1_RECTIFIER_SIDE_2_INVERTER" activePowerSetpoint="10" maxP="300" converterStation1="VSC1" converterStation2="VSC2"/>
+    <iidm:hvdcLine id="HVDC2" name="HVDC2" r="1" nominalV="400" convertersMode="SIDE_1_RECTIFIER_SIDE_2_INVERTER" activePowerSetpoint="80" maxP="300" converterStation1="LCC1" converterStation2="LCC2"/>
+</iidm:network>
diff --git a/test/resources/V1_5/internalConnections.xml b/test/resources/V1_5/internalConnections.xml
new file mode 100644
index 000000000..cc3b3329a
--- /dev/null
+++ b/test/resources/V1_5/internalConnections.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" id="internal-connections" caseDate="2018-11-08T12:33:26.208000+01:00" forecastDistance="0" sourceFormat="test">
+    <iidm:substation id="s1" country="ES">
+        <iidm:voltageLevel id="vl1" nominalV="400" topologyKind="NODE_BREAKER">
+            <iidm:nodeBreakerTopology>
+                <iidm:busbarSection id="b1" node="2"/>
+                <iidm:switch id="br1" kind="BREAKER" retained="false" open="false" node1="1" node2="2"/>
+                <iidm:internalConnection node1="0" node2="1"/>
+                <iidm:internalConnection node1="3" node2="4"/>
+            </iidm:nodeBreakerTopology>
+            <iidm:generator id="g1" energySource="OTHER" minP="0" maxP="100" voltageRegulatorOn="true" targetP="10" targetV="400" node="0">
+                <iidm:minMaxReactiveLimits minQ="-1.7976931348623157e+308" maxQ="1.7976931348623157e+308"/>
+            </iidm:generator>
+        </iidm:voltageLevel>
+    </iidm:substation>
+    <iidm:substation id="s2" country="ES">
+        <iidm:voltageLevel id="vl2" nominalV="400" topologyKind="NODE_BREAKER">
+            <iidm:nodeBreakerTopology>
+                <iidm:busbarSection id="b2" node="2"/>
+                <iidm:switch id="br2" kind="BREAKER" retained="false" open="false" node1="1" node2="2"/>
+                <iidm:internalConnection node1="0" node2="1"/>
+                <iidm:internalConnection node1="3" node2="4"/>
+            </iidm:nodeBreakerTopology>
+            <iidm:load id="l2" loadType="UNDEFINED" p0="10" q0="1" node="0"/>
+        </iidm:voltageLevel>
+    </iidm:substation>
+    <iidm:line id="line1-2" r="0.10000000000000001" x="10" g1="0" b1="0" g2="0" b2="0" node1="4" voltageLevelId1="vl1" node2="4" voltageLevelId2="vl2"/>
+</iidm:network>
diff --git a/test/resources/V1_5/loadDetailRef.xml b/test/resources/V1_5/loadDetailRef.xml
new file mode 100644
index 000000000..0af74498c
--- /dev/null
+++ b/test/resources/V1_5/loadDetailRef.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" xmlns:ld="http://www.itesla_project.eu/schema/iidm/ext/load_detail/1_0" id="test" caseDate="2016-06-27T12:27:58.535000+02:00" forecastDistance="0" sourceFormat="test">
+    <iidm:substation id="S" country="FR">
+        <iidm:voltageLevel id="VL" nominalV="400" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="B"/>
+            </iidm:busBreakerTopology>
+            <iidm:load id="L" loadType="UNDEFINED" p0="100" q0="50" bus="B" connectableBus="B"/>
+        </iidm:voltageLevel>
+    </iidm:substation>
+    <iidm:extension id="L">
+        <ld:detail fixedActivePower="40" fixedReactivePower="20" variableActivePower="60" variableReactivePower="30"/>
+    </iidm:extension>
+</iidm:network>
diff --git a/test/resources/V1_5/multiple-extensions.xml b/test/resources/V1_5/multiple-extensions.xml
new file mode 100644
index 000000000..6b304a533
--- /dev/null
+++ b/test/resources/V1_5/multiple-extensions.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" xmlns:bar="http://www.itesla_project.eu/schema/iidm/ext/loadbar/1_0" xmlns:foo="http://www.itesla_project.eu/schema/iidm/ext/loadfoo/1_0" id="test" caseDate="2017-11-17T12:00:00+01:00" forecastDistance="0" sourceFormat="test">
+    <iidm:substation id="S" country="FR">
+        <iidm:voltageLevel id="VL" nominalV="20" lowVoltageLimit="15" highVoltageLimit="25" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="BUS"/>
+            </iidm:busBreakerTopology>
+            <iidm:load id="LOAD" loadType="UNDEFINED" p0="0" q0="0" bus="BUS" connectableBus="BUS"/>
+            <iidm:load id="LOAD2" loadType="UNDEFINED" p0="0" q0="0" bus="BUS" connectableBus="BUS"/>
+        </iidm:voltageLevel>
+    </iidm:substation>
+    <iidm:extension id="LOAD">
+        <bar:loadBar/>
+        <foo:loadFoo/>
+    </iidm:extension>
+    <iidm:extension id="LOAD2">
+        <foo:loadFoo/>
+    </iidm:extension>
+</iidm:network>
diff --git a/test/resources/V1_5/nonLinearShuntRoundTripRef.xml b/test/resources/V1_5/nonLinearShuntRoundTripRef.xml
new file mode 100644
index 000000000..e83387881
--- /dev/null
+++ b/test/resources/V1_5/nonLinearShuntRoundTripRef.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" id="shuntTestCase" caseDate="2019-09-30T16:29:18.263000+02:00" forecastDistance="0" sourceFormat="test">
+    <iidm:substation id="S1" country="FR">
+        <iidm:voltageLevel id="VL1" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="B1"/>
+            </iidm:busBreakerTopology>
+            <iidm:shunt id="SHUNT" sectionCount="1" voltageRegulatorOn="true" targetV="200" targetDeadband="5" bus="B1" connectableBus="B1">
+                <iidm:property name="test" value="test"/>
+                <iidm:shuntNonLinearModel>
+                    <iidm:section b="1.0000000000000001e-05" g="0"/>
+                    <iidm:section b="0.02" g="0.29999999999999999"/>
+                </iidm:shuntNonLinearModel>
+                <iidm:regulatingTerminal id="LOAD"/>
+            </iidm:shunt>
+        </iidm:voltageLevel>
+    </iidm:substation>
+    <iidm:substation id="S2" country="FR">
+        <iidm:voltageLevel id="VL2" nominalV="220" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="B2"/>
+            </iidm:busBreakerTopology>
+            <iidm:load id="LOAD" loadType="UNDEFINED" p0="100" q0="50" bus="B2" connectableBus="B2"/>
+        </iidm:voltageLevel>
+    </iidm:substation>
+</iidm:network>
diff --git a/test/resources/V1_5/optionalLoadTypeBug.xml b/test/resources/V1_5/optionalLoadTypeBug.xml
new file mode 100644
index 000000000..fe70027d6
--- /dev/null
+++ b/test/resources/V1_5/optionalLoadTypeBug.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" id="test" caseDate="2014-02-12T13:19:17+01:00" forecastDistance="0" sourceFormat="???">
+    <iidm:substation id="S" country="FR" tso="RTE">
+        <iidm:voltageLevel id="V" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="B"/>
+            </iidm:busBreakerTopology>
+            <iidm:load id="L" p0="1" q0="2" bus="B" connectableBus="B"/>
+        </iidm:voltageLevel>
+    </iidm:substation>
+</iidm:network>
diff --git a/test/resources/V1_5/phaseShifterRoundTripRef.xml b/test/resources/V1_5/phaseShifterRoundTripRef.xml
new file mode 100644
index 000000000..71e1e4f0f
--- /dev/null
+++ b/test/resources/V1_5/phaseShifterRoundTripRef.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" id="phaseShifterTestCase" caseDate="2016-10-18T10:06:00+02:00" forecastDistance="0" sourceFormat="code">
+    <iidm:substation id="S1" country="FR">
+        <iidm:voltageLevel id="VL1" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="B1" v="400" angle="0"/>
+            </iidm:busBreakerTopology>
+            <iidm:generator id="G1" energySource="OTHER" minP="50" maxP="150" voltageRegulatorOn="true" targetP="100" targetV="400" bus="B1" connectableBus="B1" p="-100.16797" q="-58.402831999999997">
+                <iidm:minMaxReactiveLimits minQ="-1.7976931348623157e+308" maxQ="1.7976931348623157e+308"/>
+            </iidm:generator>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VL3" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="B3" v="392.64429999999999" angle="-1.8060944999999999"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="PS1" r="2" x="100" g="0" b="0" ratedU1="380" ratedU2="380" bus1="B1" connectableBus1="B1" voltageLevelId1="VL1" bus2="B3" connectableBus2="B3" voltageLevelId2="VL3" p1="50.084029999999998" q1="29.201415999999998" p2="-50.042014999999999" q2="-27.100708000000001">
+            <iidm:phaseTapChanger lowTapPosition="0" tapPosition="1" targetDeadband="10" regulationMode="FIXED_TAP" regulationValue="200">
+                <iidm:terminalRef id="PS1" side="TWO"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1" alpha="-20"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1" alpha="0"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1" alpha="20"/>
+            </iidm:phaseTapChanger>
+        </iidm:twoWindingsTransformer>
+    </iidm:substation>
+    <iidm:substation id="S2" country="FR">
+        <iidm:voltageLevel id="VL2" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="B2" v="385.6934" angle="-3.6792064"/>
+            </iidm:busBreakerTopology>
+            <iidm:load id="LD2" loadType="UNDEFINED" p0="100" q0="50" bus="B2" connectableBus="B2" p="100" q="50"/>
+        </iidm:voltageLevel>
+    </iidm:substation>
+    <iidm:line id="L1" r="4" x="200" g1="0" b1="0" g2="0" b2="0" bus1="B1" connectableBus1="B1" voltageLevelId1="VL1" bus2="B2" connectableBus2="B2" voltageLevelId2="VL2" p1="50.084026000000001" q1="29.201415999999998" p2="-50" q2="-25"/>
+    <iidm:line id="L2" r="2" x="100" g1="0" b1="0" g2="0" b2="0" bus1="B3" connectableBus1="B3" voltageLevelId1="VL3" bus2="B2" connectableBus2="B2" voltageLevelId2="VL2" p1="50.042014999999999" q1="27.100708000000001" p2="-50" q2="-25"/>
+</iidm:network>
diff --git a/test/resources/V1_5/reactiveLimitsRoundTripRef.xml b/test/resources/V1_5/reactiveLimitsRoundTripRef.xml
new file mode 100644
index 000000000..7d8e535e4
--- /dev/null
+++ b/test/resources/V1_5/reactiveLimitsRoundTripRef.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" id="ReactiveLimits" caseDate="2016-01-01T10:00:00+02:00" forecastDistance="0" sourceFormat="???">
+    <iidm:substation id="S" country="FR" tso="RTE">
+        <iidm:voltageLevel id="VL" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="B"/>
+            </iidm:busBreakerTopology>
+            <iidm:generator id="G1" energySource="OTHER" minP="0" maxP="10" voltageRegulatorOn="true" targetP="10" targetV="380" bus="B" connectableBus="B">
+                <iidm:reactiveCapabilityCurve>
+                    <iidm:point p="5" minQ="1" maxQ="10"/>
+                    <iidm:point p="10" minQ="-10" maxQ="1"/>
+                </iidm:reactiveCapabilityCurve>
+            </iidm:generator>
+            <iidm:generator id="G2" energySource="OTHER" minP="0" maxP="10" voltageRegulatorOn="true" targetP="10" targetV="380" bus="B" connectableBus="B">
+                <iidm:minMaxReactiveLimits minQ="1" maxQ="10"/>
+            </iidm:generator>
+        </iidm:voltageLevel>
+    </iidm:substation>
+</iidm:network>
diff --git a/test/resources/V1_5/regulatingStaticVarCompensatorRoundTripRef.xml b/test/resources/V1_5/regulatingStaticVarCompensatorRoundTripRef.xml
new file mode 100644
index 000000000..2f14899b7
--- /dev/null
+++ b/test/resources/V1_5/regulatingStaticVarCompensatorRoundTripRef.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" id="svcTestCase" caseDate="2016-06-29T14:54:03.427000+02:00" forecastDistance="0" sourceFormat="code">
+    <iidm:substation id="S1" country="FR">
+        <iidm:voltageLevel id="VL1" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="B1"/>
+            </iidm:busBreakerTopology>
+            <iidm:generator id="G1" energySource="OTHER" minP="50" maxP="150" voltageRegulatorOn="true" targetP="100" targetV="400" bus="B1" connectableBus="B1">
+                <iidm:minMaxReactiveLimits minQ="-1.7976931348623157e+308" maxQ="1.7976931348623157e+308"/>
+            </iidm:generator>
+        </iidm:voltageLevel>
+    </iidm:substation>
+    <iidm:substation id="S2" country="FR">
+        <iidm:voltageLevel id="VL2" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="B2"/>
+            </iidm:busBreakerTopology>
+            <iidm:load id="L2" loadType="UNDEFINED" p0="100" q0="50" bus="B2" connectableBus="B2"/>
+            <iidm:staticVarCompensator id="SVC2" bMin="0.00020000000000000001" bMax="0.00080000000000000004" voltageSetpoint="390" regulationMode="VOLTAGE" bus="B2" connectableBus="B2">
+                <iidm:property name="test" value="test"/>
+                <iidm:regulatingTerminal id="L2"/>
+            </iidm:staticVarCompensator>
+        </iidm:voltageLevel>
+    </iidm:substation>
+    <iidm:line id="L1" r="4" x="200" g1="0" b1="0" g2="0" b2="0" bus1="B1" connectableBus1="B1" voltageLevelId1="VL1" bus2="B2" connectableBus2="B2" voltageLevelId2="VL2"/>
+</iidm:network>
diff --git a/test/resources/V1_5/regulatingTerminal.xml b/test/resources/V1_5/regulatingTerminal.xml
new file mode 100644
index 000000000..b45ff6dc2
--- /dev/null
+++ b/test/resources/V1_5/regulatingTerminal.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" id="three-windings-transformer" caseDate="2018-03-05T13:30:30.486000+01:00" forecastDistance="0" sourceFormat="test">
+    <iidm:substation id="SUBSTATION" country="FR">
+        <iidm:voltageLevel id="VL_132" nominalV="132" lowVoltageLimit="118.8" highVoltageLimit="145.19999999999999" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="BUS_132" v="133.584" angle="-9.6199999999999992"/>
+            </iidm:busBreakerTopology>
+            <iidm:generator id="GEN" energySource="OTHER" minP="-9999.9899999999998" maxP="9999.9899999999998" voltageRegulatorOn="true" targetP="607" targetV="24.5" targetQ="301" bus="BUS_132" connectableBus="BUS_132">
+                <iidm:regulatingTerminal id="3WT" side="THREE"/>
+                <iidm:minMaxReactiveLimits minQ="-9999.9899999999998" maxQ="9999.9899999999998"/>
+            </iidm:generator>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VL_33" nominalV="33" lowVoltageLimit="29.699999999999999" highVoltageLimit="36.299999999999997" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="BUS_33" v="34.881" angle="-15.24"/>
+            </iidm:busBreakerTopology>
+            <iidm:load id="LOAD_33" loadType="UNDEFINED" p0="11.199999999999999" q0="7.5" bus="BUS_33" connectableBus="BUS_33" p="11.199999999999999" q="7.5"/>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VL_11" nominalV="11" lowVoltageLimit="9.9000000000000004" highVoltageLimit="12.1" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="BUS_11" v="11.781000000000001" angle="-15.24"/>
+            </iidm:busBreakerTopology>
+            <iidm:load id="LOAD_11" loadType="UNDEFINED" p0="0" q0="-10.6" bus="BUS_11" connectableBus="BUS_11" p="0" q="-10.6"/>
+        </iidm:voltageLevel>
+        <iidm:threeWindingsTransformer id="3WT" r1="17.423999999999999" x1="1.7423999999999999" g1="0.0057392102846648297" b1="0.00057392102846648299" ratedU1="132" r2="1.089" x2="0.1089" g2="0" b2="0" ratedU2="33" r3="0.121" x3="0.0121" g3="0" b3="0" ratedU3="11" ratedU0="132" bus1="BUS_132" connectableBus1="BUS_132" voltageLevelId1="VL_132" bus2="BUS_33" connectableBus2="BUS_33" voltageLevelId2="VL_33" bus3="BUS_11" connectableBus3="BUS_11" voltageLevelId3="VL_11"/>
+    </iidm:substation>
+</iidm:network>
diff --git a/test/resources/V1_5/shuntRoundTripRef.xml b/test/resources/V1_5/shuntRoundTripRef.xml
new file mode 100644
index 000000000..5fe3d0834
--- /dev/null
+++ b/test/resources/V1_5/shuntRoundTripRef.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" id="shuntTestCase" caseDate="2019-09-30T16:29:18.263000+02:00" forecastDistance="0" sourceFormat="test">
+    <iidm:substation id="S1" country="FR">
+        <iidm:voltageLevel id="VL1" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="B1"/>
+            </iidm:busBreakerTopology>
+            <iidm:shunt id="SHUNT" sectionCount="1" voltageRegulatorOn="true" targetV="200" targetDeadband="5" bus="B1" connectableBus="B1">
+                <iidm:alias>Alias</iidm:alias>
+                <iidm:property name="test" value="test"/>
+                <iidm:shuntLinearModel bPerSection="1.0000000000000001e-05" maximumSectionCount="1"/>
+                <iidm:regulatingTerminal id="LOAD"/>
+            </iidm:shunt>
+        </iidm:voltageLevel>
+    </iidm:substation>
+    <iidm:substation id="S2" country="FR">
+        <iidm:voltageLevel id="VL2" nominalV="220" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="B2"/>
+            </iidm:busBreakerTopology>
+            <iidm:load id="LOAD" loadType="UNDEFINED" p0="100" q0="50" bus="B2" connectableBus="B2"/>
+        </iidm:voltageLevel>
+    </iidm:substation>
+</iidm:network>
diff --git a/test/resources/V1_5/staticVarCompensatorRoundTripRef.xml b/test/resources/V1_5/staticVarCompensatorRoundTripRef.xml
new file mode 100644
index 000000000..7210b1220
--- /dev/null
+++ b/test/resources/V1_5/staticVarCompensatorRoundTripRef.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" id="svcTestCase" caseDate="2016-06-29T14:54:03.427000+02:00" forecastDistance="0" sourceFormat="code">
+    <iidm:substation id="S1" country="FR">
+        <iidm:voltageLevel id="VL1" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="B1"/>
+            </iidm:busBreakerTopology>
+            <iidm:generator id="G1" energySource="OTHER" minP="50" maxP="150" voltageRegulatorOn="true" targetP="100" targetV="400" bus="B1" connectableBus="B1">
+                <iidm:minMaxReactiveLimits minQ="-1.7976931348623157e+308" maxQ="1.7976931348623157e+308"/>
+            </iidm:generator>
+        </iidm:voltageLevel>
+    </iidm:substation>
+    <iidm:substation id="S2" country="FR">
+        <iidm:voltageLevel id="VL2" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="B2"/>
+            </iidm:busBreakerTopology>
+            <iidm:load id="L2" loadType="UNDEFINED" p0="100" q0="50" bus="B2" connectableBus="B2"/>
+            <iidm:staticVarCompensator id="SVC2" bMin="0.00020000000000000001" bMax="0.00080000000000000004" voltageSetpoint="390" regulationMode="VOLTAGE" bus="B2" connectableBus="B2">
+                <iidm:property name="test" value="test"/>
+            </iidm:staticVarCompensator>
+        </iidm:voltageLevel>
+    </iidm:substation>
+    <iidm:line id="L1" r="4" x="200" g1="0" b1="0" g2="0" b2="0" bus1="B1" connectableBus1="B1" voltageLevelId1="VL1" bus2="B2" connectableBus2="B2" voltageLevelId2="VL2"/>
+</iidm:network>
diff --git a/test/resources/V1_5/terminalRef.xml b/test/resources/V1_5/terminalRef.xml
new file mode 100644
index 000000000..d3e067e96
--- /dev/null
+++ b/test/resources/V1_5/terminalRef.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" id="terminalRef" caseDate="2014-11-08T19:00:00+01:00" forecastDistance="0" sourceFormat="test">
+    <iidm:substation id="S1" country="FR" tso="RTE">
+        <iidm:voltageLevel id="VL4" nominalV="90" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="VL41" v="91.126113899999993" angle="-11.178720500000001"/>
+            </iidm:busBreakerTopology>
+            <iidm:shunt id="SHUNT_VL4.11" sectionCount="1" voltageRegulatorOn="false" connectableBus="VL41" q="9999">
+                <iidm:shuntLinearModel bPerSection="0.0035802468191832304" maximumSectionCount="1"/>
+            </iidm:shunt>
+            <iidm:shunt id="SHUNT_VL4.21" sectionCount="1" voltageRegulatorOn="false" connectableBus="VL41" q="9999">
+                <iidm:shuntLinearModel bPerSection="0.0037037036381661892" maximumSectionCount="1"/>
+            </iidm:shunt>
+            <iidm:shunt id="SHUNT_VL4.31" sectionCount="1" voltageRegulatorOn="false" connectableBus="VL41" q="9999">
+                <iidm:shuntLinearModel bPerSection="0.0037037036381661892" maximumSectionCount="1"/>
+            </iidm:shunt>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VL6" nominalV="225" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="VL61" v="237.97369399999999" angle="-9.0618209800000002"/>
+            </iidm:busBreakerTopology>
+            <iidm:generator id="GEN" energySource="OTHER" minP="-9999.9899999999998" maxP="9999.9899999999998" voltageRegulatorOn="true" targetP="100" targetV="225" targetQ="0" bus="VL61" connectableBus="VL61">
+                <iidm:regulatingTerminal id="SHUNT_VL4.31"/>
+                <iidm:minMaxReactiveLimits minQ="-9999.9899999999998" maxQ="9999.9899999999998"/>
+            </iidm:generator>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="VLY641" r="1.549974799156189" x="58.800025939941406" g="0" b="0" ratedU1="90" ratedU2="225" bus1="VL41" connectableBus1="VL41" voltageLevelId1="VL4" bus2="VL61" connectableBus2="VL61" voltageLevelId2="VL6" p1="-35.508800506591797" q1="-0.79081434011459351" p2="35.543498992919922" q2="2.1071410179138184">
+            <iidm:ratioTapChanger lowTapPosition="0" tapPosition="1" loadTapChangingCapabilities="true" regulating="false" targetV="91.128028869628906">
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.01900005"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.0080000200000001"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="0.995999992"/>
+            </iidm:ratioTapChanger>
+        </iidm:twoWindingsTransformer>
+        <iidm:twoWindingsTransformer id="VL642" r="1.8199917078018188" x="62.600349426269531" g="0" b="0" ratedU1="90" ratedU2="225" bus1="VL41" connectableBus1="VL41" voltageLevelId1="VL4" bus2="VL61" connectableBus2="VL61" voltageLevelId2="VL6" p1="-33.338603973388672" q1="-2.3741626739501953" p2="33.374824523925781" q2="3.6199276447296143">
+            <iidm:ratioTapChanger lowTapPosition="0" tapPosition="1" loadTapChangingCapabilities="true" regulating="false" targetV="91.128028869628906">
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.0160000300000001"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.0039999500000001"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="0.991999984"/>
+            </iidm:ratioTapChanger>
+        </iidm:twoWindingsTransformer>
+        <iidm:twoWindingsTransformer id="VLY643" r="0.047249999999999993" x="4.0497243656204551" g="0" b="0" ratedU1="400" ratedU2="158" bus1="VL41" connectableBus1="VL41" voltageLevelId1="VL4" bus2="VL61" connectableBus2="VL61" voltageLevelId2="VL6">
+            <iidm:phaseTapChanger lowTapPosition="0" tapPosition="1" regulationMode="FIXED_TAP" regulationValue="200">
+                <iidm:step r="0" x="0" g="0" b="0" rho="0.85056669052441913" alpha="-1"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.0006666666666666" alpha="0"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.1507666428089141" alpha="1"/>
+            </iidm:phaseTapChanger>
+        </iidm:twoWindingsTransformer>
+        <iidm:twoWindingsTransformer id="VLY644" r="0.047249999999999993" x="4.0497243656204551" g="0" b="0" ratedU1="400" ratedU2="158" bus1="VL41" connectableBus1="VL41" voltageLevelId1="VL4" bus2="VL61" connectableBus2="VL61" voltageLevelId2="VL6">
+            <iidm:phaseTapChanger lowTapPosition="0" tapPosition="1" regulationMode="FIXED_TAP" regulationValue="200">
+                <iidm:step r="0" x="0" g="0" b="0" rho="0.85056669052441913" alpha="-1"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.0006666666666666" alpha="0"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.1507666428089141" alpha="1"/>
+            </iidm:phaseTapChanger>
+        </iidm:twoWindingsTransformer>
+    </iidm:substation>
+</iidm:network>
diff --git a/test/resources/V1_5/threeWindingsTransformerRoundTripRef.xml b/test/resources/V1_5/threeWindingsTransformerRoundTripRef.xml
new file mode 100644
index 000000000..1cd3dd770
--- /dev/null
+++ b/test/resources/V1_5/threeWindingsTransformerRoundTripRef.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" id="three-windings-transformer" caseDate="2018-03-05T13:30:30.486000+01:00" forecastDistance="0" sourceFormat="test">
+    <iidm:substation id="SUBSTATION" country="FR">
+        <iidm:voltageLevel id="VL_132" nominalV="132" lowVoltageLimit="118.8" highVoltageLimit="145.19999999999999" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="BUS_132" v="133.584" angle="-9.6199999999999992"/>
+            </iidm:busBreakerTopology>
+            <iidm:load id="LOAD_132" loadType="UNDEFINED" p0="7.5999999999999996" q0="1.6000000000000001" bus="BUS_132" connectableBus="BUS_132"/>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VL_33" nominalV="33" lowVoltageLimit="29.699999999999999" highVoltageLimit="36.299999999999997" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="BUS_33" v="34.881" angle="-15.24"/>
+            </iidm:busBreakerTopology>
+            <iidm:load id="LOAD_33" loadType="UNDEFINED" p0="11.199999999999999" q0="7.5" bus="BUS_33" connectableBus="BUS_33" p="11.199999999999999" q="7.5"/>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VL_11" nominalV="11" lowVoltageLimit="9.9000000000000004" highVoltageLimit="12.1" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="BUS_11" v="11.781000000000001" angle="-15.24"/>
+            </iidm:busBreakerTopology>
+            <iidm:load id="LOAD_11" loadType="UNDEFINED" p0="0" q0="-10.6" bus="BUS_11" connectableBus="BUS_11" p="0" q="-10.6"/>
+        </iidm:voltageLevel>
+        <iidm:threeWindingsTransformer id="3WT" r1="17.423999999999999" x1="1.7423999999999999" g1="0.0057392102846648297" b1="0.00057392102846648299" ratedU1="132" r2="1.089" x2="0.1089" g2="0" b2="0" ratedU2="33" r3="0.121" x3="0.0121" g3="0" b3="0" ratedU3="11" ratedU0="132" bus1="BUS_132" connectableBus1="BUS_132" voltageLevelId1="VL_132" bus2="BUS_33" connectableBus2="BUS_33" voltageLevelId2="VL_33" bus3="BUS_11" connectableBus3="BUS_11" voltageLevelId3="VL_11">
+            <iidm:ratioTapChanger2 lowTapPosition="0" tapPosition="2" targetDeadband="0" loadTapChangingCapabilities="true" regulating="true" targetV="33">
+                <iidm:terminalRef id="LOAD_33"/>
+                <iidm:step r="0.98009999999999997" x="0.09801" g="0.082644628099173556" b="0.0082644628099173556" rho="0.90000000000000002"/>
+                <iidm:step r="1.089" x="0.1089" g="0.091827364554637275" b="0.0091827364554637279" rho="1"/>
+                <iidm:step r="1.1979" x="0.11978999999999999" g="0.10101010101010101" b="0.0101010101010101" rho="1.1000000000000001"/>
+            </iidm:ratioTapChanger2>
+            <iidm:ratioTapChanger3 lowTapPosition="0" tapPosition="0" targetDeadband="0" loadTapChangingCapabilities="true" regulating="false" targetV="11">
+                <iidm:terminalRef id="LOAD_11"/>
+                <iidm:step r="0.1089" x="0.01089" g="0.82644628099173556" b="0.082644628099173556" rho="0.90000000000000002"/>
+                <iidm:step r="0.121" x="0.0121" g="0.82644628099173556" b="0.082644628099173556" rho="1"/>
+                <iidm:step r="0.1331" x="0.013310000000000001" g="0.90909090909090917" b="0.090909090909090925" rho="1.1000000000000001"/>
+            </iidm:ratioTapChanger3>
+            <iidm:currentLimits1 permanentLimit="1000">
+                <iidm:temporaryLimit name="20'" acceptableDuration="1200" value="1200"/>
+                <iidm:temporaryLimit name="10'" acceptableDuration="600" value="1400"/>
+            </iidm:currentLimits1>
+            <iidm:currentLimits2 permanentLimit="100">
+                <iidm:temporaryLimit name="20'" acceptableDuration="1200" value="120"/>
+                <iidm:temporaryLimit name="10'" acceptableDuration="600" value="140"/>
+            </iidm:currentLimits2>
+            <iidm:currentLimits3 permanentLimit="10">
+                <iidm:temporaryLimit name="20'" acceptableDuration="1200" value="12"/>
+                <iidm:temporaryLimit name="10'" acceptableDuration="600" value="14"/>
+            </iidm:currentLimits3>
+        </iidm:threeWindingsTransformer>
+    </iidm:substation>
+</iidm:network>
diff --git a/test/resources/V1_5/tieline.xml b/test/resources/V1_5/tieline.xml
new file mode 100644
index 000000000..fc2f94cdb
--- /dev/null
+++ b/test/resources/V1_5/tieline.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" id="sim1" caseDate="2013-01-15T18:45:00+01:00" forecastDistance="0" sourceFormat="test">
+    <iidm:substation id="P1" country="FR" tso="RTE" geographicalTags="A">
+        <iidm:voltageLevel id="VLGEN" nominalV="24" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NGEN" v="24.500000610351563" angle="2.3259763717651367"/>
+            </iidm:busBreakerTopology>
+            <iidm:generator id="GEN" energySource="OTHER" minP="-9999.9899999999998" maxP="9999.9899999999998" voltageRegulatorOn="true" targetP="607" targetV="24.5" targetQ="301" bus="NGEN" connectableBus="NGEN" p="-605.558349609375" q="-225.28251647949219">
+                <iidm:minMaxReactiveLimits minQ="-9999.9899999999998" maxQ="9999.9899999999998"/>
+            </iidm:generator>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLHV1" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV1" v="402.14284515380859" angle="0"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NGEN_NHV1" r="0.26658461538461536" x="11.104492831516762" g="0" b="0" ratedU1="24" ratedU2="400" bus1="NGEN" connectableBus1="NGEN" voltageLevelId1="VLGEN" bus2="NHV1" connectableBus2="NHV1" voltageLevelId2="VLHV1" p1="605.558349609375" q1="225.28251647949219" p2="-604.89093017578125" q2="-197.48046875"/>
+    </iidm:substation>
+    <iidm:substation id="P2" country="FR" tso="RTE" geographicalTags="B">
+        <iidm:voltageLevel id="VLHV2" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV2" v="389.95267639160159" angle="-3.5063576698303223"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLLOAD" nominalV="150" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NLOAD" v="147.57861328125" angle="-9.6144866943359375"/>
+            </iidm:busBreakerTopology>
+            <iidm:load id="LOAD" loadType="UNDEFINED" p0="600" q0="200" bus="NLOAD" connectableBus="NLOAD" p="600" q="200"/>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NHV2_NLOAD" r="0.047249999999999993" x="4.0497243656204551" g="0" b="0" ratedU1="400" ratedU2="158" bus1="NHV2" connectableBus1="NHV2" voltageLevelId1="VLHV2" bus2="NLOAD" connectableBus2="NLOAD" voltageLevelId2="VLLOAD" p1="600.8677978515625" q1="274.37698364257" p2="-600" q2="-200">
+            <iidm:ratioTapChanger lowTapPosition="0" tapPosition="1" targetDeadband="0" loadTapChangingCapabilities="true" regulating="true" targetV="158">
+                <iidm:terminalRef id="NHV2_NLOAD" side="TWO"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="0.85056669052441913"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.0006666666666666"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.1507666428089141"/>
+            </iidm:ratioTapChanger>
+        </iidm:twoWindingsTransformer>
+    </iidm:substation>
+    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05"/>
+    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05"/>
+</iidm:network>
diff --git a/test/resources/V1_5/tielineFictitious.xml b/test/resources/V1_5/tielineFictitious.xml
new file mode 100644
index 000000000..57100c5b2
--- /dev/null
+++ b/test/resources/V1_5/tielineFictitious.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" id="sim1" caseDate="2013-01-15T18:45:00+01:00" forecastDistance="0" sourceFormat="test">
+    <iidm:substation id="P1" country="FR" tso="RTE" geographicalTags="A">
+        <iidm:voltageLevel id="VLGEN" nominalV="24" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NGEN" v="24.500000610351563" angle="2.3259763717651367"/>
+            </iidm:busBreakerTopology>
+            <iidm:generator id="GEN" energySource="OTHER" minP="-9999.9899999999998" maxP="9999.9899999999998" voltageRegulatorOn="true" targetP="607" targetV="24.5" targetQ="301" bus="NGEN" connectableBus="NGEN" p="-605.558349609375" q="-225.28251647949219">
+                <iidm:minMaxReactiveLimits minQ="-9999.9899999999998" maxQ="9999.9899999999998"/>
+            </iidm:generator>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLHV1" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV1" v="402.14284515380859" angle="0"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NGEN_NHV1" r="0.26658461538461536" x="11.104492831516762" g="0" b="0" ratedU1="24" ratedU2="400" bus1="NGEN" connectableBus1="NGEN" voltageLevelId1="VLGEN" bus2="NHV1" connectableBus2="NHV1" voltageLevelId2="VLHV1" p1="605.558349609375" q1="225.28251647949219" p2="-604.89093017578125" q2="-197.48046875"/>
+    </iidm:substation>
+    <iidm:substation id="P2" country="FR" tso="RTE" geographicalTags="B">
+        <iidm:voltageLevel id="VLHV2" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV2" v="389.95267639160159" angle="-3.5063576698303223"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLLOAD" nominalV="150" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NLOAD" v="147.57861328125" angle="-9.6144866943359375"/>
+            </iidm:busBreakerTopology>
+            <iidm:load id="LOAD" loadType="UNDEFINED" p0="600" q0="200" bus="NLOAD" connectableBus="NLOAD" p="600" q="200"/>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NHV2_NLOAD" r="0.047249999999999993" x="4.0497243656204551" g="0" b="0" ratedU1="400" ratedU2="158" bus1="NHV2" connectableBus1="NHV2" voltageLevelId1="VLHV2" bus2="NLOAD" connectableBus2="NLOAD" voltageLevelId2="VLLOAD" p1="600.8677978515625" q1="274.37698364257" p2="-600" q2="-200">
+            <iidm:ratioTapChanger lowTapPosition="0" tapPosition="1" targetDeadband="0" loadTapChangingCapabilities="true" regulating="true" targetV="158">
+                <iidm:terminalRef id="NHV2_NLOAD" side="TWO"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="0.85056669052441913"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.0006666666666666"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.1507666428089141"/>
+            </iidm:ratioTapChanger>
+        </iidm:twoWindingsTransformer>
+    </iidm:substation>
+    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" fictitious_1="true" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05"/>
+    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" fictitious_2="true"/>
+</iidm:network>
diff --git a/test/resources/V1_5/tielineWithAliases.xml b/test/resources/V1_5/tielineWithAliases.xml
new file mode 100644
index 000000000..c7409b3b9
--- /dev/null
+++ b/test/resources/V1_5/tielineWithAliases.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" id="sim1" caseDate="2013-01-15T18:45:00+01:00" forecastDistance="0" sourceFormat="test">
+    <iidm:substation id="P1" country="FR" tso="RTE" geographicalTags="A">
+        <iidm:voltageLevel id="VLGEN" nominalV="24" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NGEN" v="24.500000610351563" angle="2.3259763717651367"/>
+            </iidm:busBreakerTopology>
+            <iidm:generator id="GEN" energySource="OTHER" minP="-9999.9899999999998" maxP="9999.9899999999998" voltageRegulatorOn="true" targetP="607" targetV="24.5" targetQ="301" bus="NGEN" connectableBus="NGEN" p="-605.558349609375" q="-225.28251647949219">
+                <iidm:minMaxReactiveLimits minQ="-9999.9899999999998" maxQ="9999.9899999999998"/>
+            </iidm:generator>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLHV1" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV1" v="402.14284515380859" angle="0"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NGEN_NHV1" r="0.26658461538461536" x="11.104492831516762" g="0" b="0" ratedU1="24" ratedU2="400" bus1="NGEN" connectableBus1="NGEN" voltageLevelId1="VLGEN" bus2="NHV1" connectableBus2="NHV1" voltageLevelId2="VLHV1" p1="605.558349609375" q1="225.28251647949219" p2="-604.89093017578125" q2="-197.48046875"/>
+    </iidm:substation>
+    <iidm:substation id="P2" country="FR" tso="RTE" geographicalTags="B">
+        <iidm:voltageLevel id="VLHV2" nominalV="380" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NHV2" v="389.95267639160159" angle="-3.5063576698303223"/>
+            </iidm:busBreakerTopology>
+        </iidm:voltageLevel>
+        <iidm:voltageLevel id="VLLOAD" nominalV="150" topologyKind="BUS_BREAKER">
+            <iidm:busBreakerTopology>
+                <iidm:bus id="NLOAD" v="147.57861328125" angle="-9.6144866943359375"/>
+            </iidm:busBreakerTopology>
+            <iidm:load id="LOAD" loadType="UNDEFINED" p0="600" q0="200" bus="NLOAD" connectableBus="NLOAD" p="600" q="200"/>
+        </iidm:voltageLevel>
+        <iidm:twoWindingsTransformer id="NHV2_NLOAD" r="0.047249999999999993" x="4.0497243656204551" g="0" b="0" ratedU1="400" ratedU2="158" bus1="NHV2" connectableBus1="NHV2" voltageLevelId1="VLHV2" bus2="NLOAD" connectableBus2="NLOAD" voltageLevelId2="VLLOAD" p1="600.8677978515625" q1="274.37698364257" p2="-600" q2="-200">
+            <iidm:ratioTapChanger lowTapPosition="0" tapPosition="1" targetDeadband="0" loadTapChangingCapabilities="true" regulating="true" targetV="158">
+                <iidm:terminalRef id="NHV2_NLOAD" side="TWO"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="0.85056669052441913"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.0006666666666666"/>
+                <iidm:step r="0" x="0" g="0" b="0" rho="1.1507666428089141"/>
+            </iidm:ratioTapChanger>
+        </iidm:twoWindingsTransformer>
+    </iidm:substation>
+    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05">
+        <iidm:alias>Alias</iidm:alias>
+        <iidm:alias>Other alias</iidm:alias>
+    </iidm:tieLine>
+    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05"/>
+</iidm:network>