diff --git a/examples/ESRF_tune_example/esrf_tune_example_no_yaml.py b/examples/ESRF_tune_example/esrf_tune_example_no_yaml.py
new file mode 100644
index 00000000..bb71a6bc
--- /dev/null
+++ b/examples/ESRF_tune_example/esrf_tune_example_no_yaml.py
@@ -0,0 +1,77 @@
+from pyaml.instrument import Instrument,ConfigModel as InstrumentConfigModel
+from pyaml.magnet.quadrupole import Quadrupole,ConfigModel as QuadrupoleConfig
+from pyaml.configuration.csvcurve import CSVCurve,ConfigModel as CSVCureveConfig
+from pyaml.magnet.linear_model import LinearMagnetModel,ConfigModel as LinearMagnetModelConfig
+from pyaml.lattice.simulator import Simulator,ConfigModel as SimulatorConfigModel
+from pyaml.arrays.magnet import Magnet,ConfigModel as MagnetArrayConfigModel
+from tango.pyaml.controlsystem import TangoControlSystem,ConfigModel as ControlSystemConfig
+from tango.pyaml.attribute import Attribute,ConfigModel as AttributeConfig
+from tango.pyaml.attribute_read_only import AttributeReadOnly,ConfigModel as AttributeReadOnlyConfig
+
+
+import numpy as np
+import time
+
+# Configuration
+
+tangocs = ControlSystemConfig(name="live",tango_host="ebs-simu-3:10000")
+control = TangoControlSystem(tangocs)
+control.init_cs()
+
+qfCurve = CSVCurve(CSVCureveConfig(file="config/sr/magnet_models/QF1_strength.csv"))
+qdCurve = CSVCurve(CSVCureveConfig(file="config/sr/magnet_models/QD2_strength.csv"))
+
+elemConfig = [ {"name":"QF1A-C01", "attname":"srmag/vps-qf1/c01-a/current", "calibration_factor":1.00504, "curve":qfCurve},
+               {"name":"QF1E-C01", "attname":"srmag/vps-qf1/c01-e/current", "calibration_factor":0.998212, "curve":qfCurve},
+               {"name":"QD2A-C01", "attname":"srmag/vps-qd2/c01-a/current", "calibration_factor":1.00504,  "curve":qdCurve},
+               {"name":"QD2E-C01", "attname":"srmag/vps-qd2/c01-e/current", "calibration_factor":1.003485189, "curve":qdCurve} ]
+  
+devices=[]
+names=[]
+for cfg in elemConfig:
+    qAtt = Attribute(AttributeConfig(attribute=cfg["attname"],unit="A"))
+    qModel = LinearMagnetModel(LinearMagnetModelConfig(curve=cfg["curve"],calibration_factor=cfg["calibration_factor"],powerconverter=qAtt,unit="1/m"))
+    devices.append( Quadrupole(QuadrupoleConfig(name=cfg["name"],model=qModel)) )
+    names.append(cfg["name"])
+
+
+simulator = Simulator(SimulatorConfigModel(name="design",lattice="config/sr/lattices/ebs.mat"))
+
+quads = Magnet(MagnetArrayConfigModel(name="quadsForTune",elements=names))
+
+sr = Instrument(InstrumentConfigModel(name="sr",energy=6e9,controls=[control],simulators=[simulator],devices=devices,arrays=[quads],data_folder="/tmp"))
+
+
+
+# Usage exmaple
+
+quadForTuneDesign = sr.design.get_magnets("quadsForTune")
+quadForTuneLive = sr.live.get_magnets("quadsForTune")
+
+# Compute tune response matrix for the 4 quads from simulator
+sr.design.get_lattice().disable_6d()
+tune = sr.design.get_lattice().get_tune()
+tunemat = np.zeros((len(quadForTuneDesign),2))
+for idx,m in enumerate(quadForTuneDesign):
+    str = m.strength.get()
+    m.strength.set(str+1e-4)
+    dq = sr.design.get_lattice().get_tune() - tune
+    tunemat[idx] = dq*1e4
+    m.strength.set(str)
+
+# Compute correction matrix
+correctionmat = np.linalg.pinv(tunemat.T)
+
+# Correct tune on live
+qxAtt = AttributeReadOnly(AttributeReadOnlyConfig(attribute="sys/ringsimulator/ebs/Tune_h",unit=""))
+qyAtt = AttributeReadOnly(AttributeReadOnlyConfig(attribute="sys/ringsimulator/ebs/Tune_v",unit=""))
+
+print(f"Tune={qxAtt.readback()}, {qyAtt.readback()}")
+
+strs = quadForTuneLive.strengths.get()
+strs += np.matmul(correctionmat,[0.1,0.05]) # Ask for correction [dqx,dqy]
+quadForTuneLive.strengths.set(strs)
+time.sleep(3)
+print(f"Tune={qxAtt.readback()}, {qyAtt.readback()}")
+
+        
diff --git a/pyaml/arrays/array.py b/pyaml/arrays/array.py
index 42e3daa7..621958bc 100644
--- a/pyaml/arrays/array.py
+++ b/pyaml/arrays/array.py
@@ -34,16 +34,3 @@ def fill_array(self,holder:ElementHolder):
     def init_aggregator(self,holder:ElementHolder):
         raise "Array.init_aggregator() is not subclassed"
 
-class MagnetArrayConfig(ArrayConfig):
-
-   def __init__(self, cfg: ArrayConfigModel):
-        super().__init__(cfg)
-
-   def init_aggregator(self,holder:ElementHolder):
-        if self._cfg.aggregator is not None and len(self._cfg.aggregator)==0:
-            # Construct dynamically aggregator for magnets
-            mag = holder.get_magnets(self._cfg.name)
-            for m in mag:
-                devs = m.model.get_devices()
-                self._cfg.aggregator.add_devices(devs)
-            mag.set_aggregator(self._cfg.aggregator)
\ No newline at end of file
diff --git a/pyaml/arrays/magnet.py b/pyaml/arrays/magnet.py
new file mode 100644
index 00000000..bc5c7873
--- /dev/null
+++ b/pyaml/arrays/magnet.py
@@ -0,0 +1,24 @@
+from .array import ArrayConfigModel,ArrayConfig
+from ..lattice.element_holder import ElementHolder
+
+# Define the main class name for this module
+PYAMLCLASS = "Magnet"
+
+class ConfigModel(ArrayConfigModel):...
+
+class Magnet(ArrayConfig):
+
+   def __init__(self, cfg: ArrayConfigModel):
+        super().__init__(cfg)
+
+   def fill_array(self,holder:ElementHolder):   
+        holder.fill_magnet_array(self._cfg.name,self._cfg.elements)
+
+   def init_aggregator(self,holder:ElementHolder):
+        if self._cfg.aggregator is not None and len(self._cfg.aggregator)==0:
+            # Construct dynamically aggregator for magnets
+            mag = holder.get_magnets(self._cfg.name)
+            for m in mag:
+                devs = m.model.get_devices()
+                self._cfg.aggregator.add_devices(devs)
+            mag.set_aggregator(self._cfg.aggregator)
\ No newline at end of file
diff --git a/pyaml/arrays/octupole.py b/pyaml/arrays/octupole.py
deleted file mode 100644
index a5123ae3..00000000
--- a/pyaml/arrays/octupole.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from .array import ArrayConfigModel
-from .array import MagnetArrayConfig
-from ..lattice.element_holder import ElementHolder,MagnetType
-
-# Define the main class name for this module
-PYAMLCLASS = "Octupole"
-
-class ConfigModel(ArrayConfigModel):...
-
-class Octupole(MagnetArrayConfig):
-
-    def fill_array(self,holder:ElementHolder):
-        holder.fill_magnet_array(MagnetType.OCTUPOLE,self._cfg.name,self._cfg.elements)
-
diff --git a/pyaml/arrays/quadrupole.py b/pyaml/arrays/quadrupole.py
deleted file mode 100644
index dc4f606c..00000000
--- a/pyaml/arrays/quadrupole.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from .array import ArrayConfigModel
-from .array import MagnetArrayConfig
-from ..lattice.element_holder import ElementHolder,MagnetType
-
-# Define the main class name for this module
-PYAMLCLASS = "Quadrupole"
-
-class ConfigModel(ArrayConfigModel):...
-
-class Quadrupole(MagnetArrayConfig):
-    
-    def fill_array(self,holder:ElementHolder):
-        holder.fill_magnet_array(MagnetType.QUADRUPOLE,self._cfg.name,self._cfg.elements)
diff --git a/pyaml/arrays/sextupole.py b/pyaml/arrays/sextupole.py
deleted file mode 100644
index 27910244..00000000
--- a/pyaml/arrays/sextupole.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from .array import ArrayConfigModel
-from .array import MagnetArrayConfig
-from ..lattice.element_holder import ElementHolder,MagnetType
-
-# Define the main class name for this module
-PYAMLCLASS = "Sextupole"
-
-class ConfigModel(ArrayConfigModel):...
-
-class Sextupole(MagnetArrayConfig):
-
-    def fill_array(self,holder:ElementHolder):
-        holder.fill_magnet_array(MagnetType.SEXTUPOLE,self._cfg.name,self._cfg.elements)
-
diff --git a/pyaml/arrays/skewoctu.py b/pyaml/arrays/skewoctu.py
deleted file mode 100644
index 09c25d94..00000000
--- a/pyaml/arrays/skewoctu.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from .array import ArrayConfigModel
-from .array import MagnetArrayConfig
-from ..lattice.element_holder import ElementHolder,MagnetType
-
-# Define the main class name for this module
-PYAMLCLASS = "SkewOctu"
-
-class ConfigModel(ArrayConfigModel):...
-
-class SkewOctu(MagnetArrayConfig):
-
-    def fill_array(self,holder:ElementHolder):
-        holder.fill_magnet_array(MagnetType.SKEWOCTU,self._cfg.name,self._cfg.elements)
-
diff --git a/pyaml/arrays/skewquad.py b/pyaml/arrays/skewquad.py
deleted file mode 100644
index cefa96e3..00000000
--- a/pyaml/arrays/skewquad.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from .array import ArrayConfigModel
-from .array import MagnetArrayConfig
-from ..lattice.element_holder import ElementHolder,MagnetType
-
-# Define the main class name for this module
-PYAMLCLASS = "SkewQuad"
-
-class ConfigModel(ArrayConfigModel):...
-
-class SkewQuad(MagnetArrayConfig):
-
-    def fill_array(self,holder:ElementHolder):
-        holder.fill_magnet_array(MagnetType.SKEWQUAD,self._cfg.name,self._cfg.elements)
-
diff --git a/pyaml/arrays/skewsext.py b/pyaml/arrays/skewsext.py
deleted file mode 100644
index 0e372de5..00000000
--- a/pyaml/arrays/skewsext.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from .array import ArrayConfigModel
-from .array import MagnetArrayConfig
-from ..lattice.element_holder import ElementHolder,MagnetType
-
-# Define the main class name for this module
-PYAMLCLASS = "SkewSext"
-
-class ConfigModel(ArrayConfigModel):...
-
-class SkewSext(MagnetArrayConfig):
-
-    def fill_array(self,holder:ElementHolder):
-        holder.fill_magnet_array(MagnetType.SKEWSEXT,self._cfg.name,self._cfg.elements)
-
diff --git a/pyaml/arrays/vcorrector.py b/pyaml/arrays/vcorrector.py
deleted file mode 100644
index c3a9a14c..00000000
--- a/pyaml/arrays/vcorrector.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from .array import ArrayConfigModel
-from .array import MagnetArrayConfig
-from ..lattice.element_holder import ElementHolder,MagnetType
-
-# Define the main class name for this module
-PYAMLCLASS = "VCorrector"
-
-class ConfigModel(ArrayConfigModel):...
-
-class VCorrector(MagnetArrayConfig):
-
-    def fill_array(self,holder:ElementHolder):
-        holder.fill_magnet_array(MagnetType.VCORRECTOR,self._cfg.name,self._cfg.elements)
diff --git a/pyaml/configuration/factory.py b/pyaml/configuration/factory.py
index 7d84c6ac..00223b76 100644
--- a/pyaml/configuration/factory.py
+++ b/pyaml/configuration/factory.py
@@ -168,7 +168,7 @@ def depth_first_build(self, d):
 
     def register_element(self, elt):
         if isinstance(elt,Element):
-            name = str(elt)
+            name = elt.get_name()
             if name in self._elements:
                 raise PyAMLException(f"element {name} already defined")
             self._elements[name] = elt
diff --git a/pyaml/control/abstract_impl.py b/pyaml/control/abstract_impl.py
index 77df4b5c..aba22c08 100644
--- a/pyaml/control/abstract_impl.py
+++ b/pyaml/control/abstract_impl.py
@@ -42,7 +42,7 @@ def __init__(self, model:MagnetModel):
     # Gets the value
     def get(self) -> float:
         currents = self.__model.read_hardware_values()
-        return self.__model.compute_strengths(currents)
+        return self.__model.compute_strengths(currents)[0]
 
     # Sets the value
     def set(self, value:float):
diff --git a/pyaml/control/controlsystem.py b/pyaml/control/controlsystem.py
index 6ec5605a..74be3df8 100644
--- a/pyaml/control/controlsystem.py
+++ b/pyaml/control/controlsystem.py
@@ -50,12 +50,12 @@ def fill_device(self,elements:list[Element]):
             strength = RWStrengthScalar(e.model) if e.model.has_physics() else None
             # Create a unique ref for this control system
             m = e.attach(strength, current)
-            self.add_magnet(str(m),m)
+            self.add_magnet(m.get_name(),m)
           elif isinstance(e,CombinedFunctionMagnet):
-            self.add_magnet(str(e),e)
+            self.add_magnet(e.get_name(),e)
             currents = RWHardwareArray(e.model) if e.model.has_hardware() else None
             strengths = RWStrengthArray(e.model) if e.model.has_physics() else None
             # Create unique refs of each function for this control system
             ms = e.attach(strengths,currents)
             for m in ms:
-              self.add_magnet(str(m),m)
+              self.add_magnet(m.get_name(),m)
diff --git a/pyaml/lattice/attribute_linker.py b/pyaml/lattice/attribute_linker.py
index a9fa36cb..d4efb7df 100644
--- a/pyaml/lattice/attribute_linker.py
+++ b/pyaml/lattice/attribute_linker.py
@@ -61,7 +61,7 @@ def __init__(self, config_model:ConfigModel):
         super().__init__(config_model)
 
     def get_element_identifier(self, element: Element) -> LinkerIdentifier:
-        return PyAtAttributeIdentifier(self.linker_config_model.attribute_name, element.name)
+        return PyAtAttributeIdentifier(self.linker_config_model.attribute_name, element.get_name())
 
     def _test_at_element(self, identifier: PyAtAttributeIdentifier, element: at.Element) -> bool:
         attr_value = getattr(element, identifier.attribute_name, None)
diff --git a/pyaml/lattice/element.py b/pyaml/lattice/element.py
index e7c269d7..145694eb 100644
--- a/pyaml/lattice/element.py
+++ b/pyaml/lattice/element.py
@@ -15,14 +15,19 @@ class Element(object):
     name (str): The name identifying the element in the configuration file
     """
     def __init__(self,name:str):
-        self.name: str = name
+        self.__name: str = name
+
+    def get_name(self):
+        """
+        Returns the name of the element
+        """
+        return self.__name
 
     def set_energy(self,E:float):
         pass
-    
-    # TODO: _repr_ is used for identifying element in various array. Use a get_id() method instead
+        
     def __repr__(self):
         return "%s(%s)" % (
             self.__class__.__name__,
-            self.name
+            self.__name
         )
diff --git a/pyaml/lattice/element_holder.py b/pyaml/lattice/element_holder.py
index 0265e1aa..943f62d6 100644
--- a/pyaml/lattice/element_holder.py
+++ b/pyaml/lattice/element_holder.py
@@ -5,28 +5,6 @@
 from ..magnet.magnet import Magnet
 from ..arrays.magnet_array import MagnetArray
 
-class MagnetType:
-   COMBINED = 0
-   HCORRECTOR = 1
-   VCORRECTOR = 2
-   QUADRUPOLE = 3
-   SKEWQUAD = 4
-   SEXTUPOLE = 5
-   SKEWSEXT = 6
-   OCTUPOLE = 7
-   SKEWOCTU = 8
-
-_mmap:list = [
-    "CombinedFunctionMagnet",
-    "HCorrector",
-    "VCorrector",
-    "Quadrupole",
-    "SkewQuad",
-    "Sextupole",
-    "SkewSext",
-    "Octupole",
-    "SkewOctu"]
-
 
 class ElementHolder(object):
     """
@@ -46,20 +24,19 @@ def __init__(self):
     def fill_device(self,elements:list[Element]):
        raise "ElementHolder.fill_device() is not subclassed"
     
-    def fill_magnet_array(self,type:MagnetType,arrayName:str,elementNames:list[str]):
+    def fill_magnet_array(self,arrayName:str,elementNames:list[str]):
        a = []
        for name in elementNames:
           try:
-            a.append(self.get_magnet(type,name))
+            a.append(self.get_magnet(name))
           except Exception as err:
             raise Exception(f"MagnetArray {arrayName} : {err}")
        self.__MAGNET_ARRAYS[arrayName] = MagnetArray(arrayName,a)
 
-    def get_magnet(self,type:MagnetType,name:str) -> Magnet:
-      fName = f"{_mmap[type]}({name})"
-      if fName not in self.__MAGNETS:
-        raise Exception(f"Magnet {fName} not defined")
-      return self.__MAGNETS[fName]
+    def get_magnet(self,name:str) -> Magnet:
+      if name not in self.__MAGNETS:
+        raise Exception(f"Magnet {name} not defined")
+      return self.__MAGNETS[name]
     
     def add_magnet(self,name:str,m:Magnet):
         self.__MAGNETS[name] = m
diff --git a/pyaml/lattice/simulator.py b/pyaml/lattice/simulator.py
index 450ce745..875ebd6e 100644
--- a/pyaml/lattice/simulator.py
+++ b/pyaml/lattice/simulator.py
@@ -66,16 +66,16 @@ def fill_device(self,elements:list[Element]):
             strength = RWStrengthScalar(self.get_at_elems(e),e.polynom,e.model) if e.model.has_physics() else None
             # Create a unique ref for this simulator
             m = e.attach(strength,current)
-            self.add_magnet(str(m),m)
+            self.add_magnet(m.get_name(),m)
           elif isinstance(e,CombinedFunctionMagnet):
-            self.add_magnet(str(e),e)
+            self.add_magnet(e.get_name(),e)
             currents = RWHardwareArray(self.get_at_elems(e),e.polynoms,e.model) if e.model.has_physics() else None
             strengths = RWStrengthArray(self.get_at_elems(e),e.polynoms,e.model) if e.model.has_physics() else None
             # Create unique refs of each function for this simulator
             ms = e.attach(strengths,currents)
             for m in ms:
-              self.add_magnet(str(m),m)
-              self.add_magnet(str(m),m)
+              self.add_magnet(m.get_name(),m)
+              self.add_magnet(m.get_name(),m)
     
     def get_at_elems(self,element:Element) -> list[at.Element]:
        identifier = self._linker.get_element_identifier(element)
diff --git a/tests/config/EBSTune.yaml b/tests/config/EBSTune.yaml
index 27c0c029..dac1fc72 100644
--- a/tests/config/EBSTune.yaml
+++ b/tests/config/EBSTune.yaml
@@ -13,7 +13,7 @@ instruments:
         name: live
     data_folder: /data/store
     arrays:
-      - type: pyaml.arrays.quadrupole
+      - type: pyaml.arrays.magnet
         name: QForTune
         aggregator:
           type: tango.pyaml.multi_attribute
diff --git a/tests/config/bad_conf.yml b/tests/config/bad_conf.yml
index fd1eae57..7661428b 100644
--- a/tests/config/bad_conf.yml
+++ b/tests/config/bad_conf.yml
@@ -9,12 +9,12 @@ instruments:
         name: design
     data_folder: /data/store
     arrays:
-      - type: pyaml.arrays.hcorrector
+      - type: pyaml.arrays.magnet
         name: HCORR
         elements:
           - SH1A-C01-H
           - SH1A-C02-H
-      - type: pyaml.arrays.vcorrector
+      - type: pyaml.arrays.magnet
         name: VCORR
         elements:
           - SH1A-C01-V
diff --git a/tests/config/bad_conf_cycles.json b/tests/config/bad_conf_cycles.json
index 2cd7dd31..c1f9201a 100644
--- a/tests/config/bad_conf_cycles.json
+++ b/tests/config/bad_conf_cycles.json
@@ -9,7 +9,7 @@
       "data_folder": "/data/store",
       "arrays": [
         {
-          "type": "pyaml.arrays.hcorrector",
+          "type": "pyaml.arrays.magnet",
           "name": "HCORR",
           "elements": [
             "SH1A-C01-H",
@@ -17,7 +17,7 @@
           ]
         },
         {
-          "type": "pyaml.arrays.vcorrector",
+          "type": "pyaml.arrays.magnet",
           "name": "VCORR",
           "elements": ["SH1A-C01-V", "SH1A-C02-V"]
         }
diff --git a/tests/config/bad_conf_cycles.yml b/tests/config/bad_conf_cycles.yml
index 89acd7e4..bed3a16a 100644
--- a/tests/config/bad_conf_cycles.yml
+++ b/tests/config/bad_conf_cycles.yml
@@ -9,12 +9,12 @@ instruments:
         name: design
     data_folder: /data/store
     arrays:
-      - type: pyaml.arrays.hcorrector
+      - type: pyaml.arrays.magnet
         name: HCORR
         elements:
           - SH1A-C01-H
           - SH1A-C02-H
-      - type: pyaml.arrays.vcorrector
+      - type: pyaml.arrays.magnet
         name: VCORR
         elements:
           - SH1A-C01-V
diff --git a/tests/config/sr-attribute-linker.yaml b/tests/config/sr-attribute-linker.yaml
index e43a7f38..d8cde9cf 100644
--- a/tests/config/sr-attribute-linker.yaml
+++ b/tests/config/sr-attribute-linker.yaml
@@ -12,12 +12,12 @@ instruments:
           attribute_name: FamName # equivalent to the default linker
     data_folder: /data/store
     arrays:
-      - type: pyaml.arrays.hcorrector
+      - type: pyaml.arrays.magnet
         name: HCORR
         elements:
           - SH1A-C01-H
           - SH1A-C02-H
-      - type: pyaml.arrays.vcorrector
+      - type: pyaml.arrays.magnet
         name: VCORR
         elements:
           - SH1A-C01-V
diff --git a/tests/config/sr.yaml b/tests/config/sr.yaml
index 508a4fb6..001c87c2 100644
--- a/tests/config/sr.yaml
+++ b/tests/config/sr.yaml
@@ -9,12 +9,12 @@ instruments:
         name: design
     data_folder: /data/store
     arrays:
-      - type: pyaml.arrays.hcorrector
+      - type: pyaml.arrays.magnet
         name: HCORR
         elements:
           - SH1A-C01-H
           - SH1A-C02-H
-      - type: pyaml.arrays.vcorrector
+      - type: pyaml.arrays.magnet
         name: VCORR
         elements:
           - SH1A-C01-V
diff --git a/tests/test_aggregator.py b/tests/test_aggregator.py
index c14e51b6..f363cdcc 100644
--- a/tests/test_aggregator.py
+++ b/tests/test_aggregator.py
@@ -1,7 +1,5 @@
 from pyaml.pyaml import pyaml,PyAML
 from pyaml.instrument import Instrument
-from pyaml.lattice.element_holder import MagnetType
-from pyaml.arrays.magnet_array import MagnetArray
 from pyaml.configuration.factory import Factory
 import numpy as np
 import pytest
diff --git a/tests/test_arrays.py b/tests/test_arrays.py
index 2a40ee7f..7253a20b 100644
--- a/tests/test_arrays.py
+++ b/tests/test_arrays.py
@@ -1,7 +1,6 @@
 from pyaml.pyaml import pyaml,PyAML
 from pyaml.configuration.factory import Factory
 from pyaml.instrument import Instrument
-from pyaml.lattice.element_holder import MagnetType
 from pyaml.magnet.model import MagnetModel
 import numpy as np
 
@@ -10,8 +9,8 @@ def test_arrays():
     ml:PyAML = pyaml("tests/config/sr.yaml")
     sr:Instrument = ml.get('sr')
     sr.design.get_lattice().disable_6d()
-    sr.design.get_magnet(MagnetType.HCORRECTOR,"SH1A-C01-H").strength.set(0.000010)
-    sr.design.get_magnet(MagnetType.VCORRECTOR,"SH1A-C01-V").strength.set(0.000015)
+    sr.design.get_magnet("SH1A-C01-H").strength.set(0.000010)
+    sr.design.get_magnet("SH1A-C01-V").strength.set(0.000015)
 
     o,_ = sr.design.get_lattice().find_orbit()
     assert(np.abs(o[0] + 9.91848416e-05)<1e-10)
@@ -19,8 +18,8 @@ def test_arrays():
     assert(np.abs(o[2] + 1.56246320e-06)<1e-10)
     assert(np.abs(o[3] + 1.75037311e-05)<1e-10)
 
-    sr.design.get_magnet(MagnetType.HCORRECTOR,"SH1A-C02-H").strength.set(-0.000008)
-    sr.design.get_magnet(MagnetType.VCORRECTOR,"SH1A-C02-V").strength.set(-0.000017)
+    sr.design.get_magnet("SH1A-C02-H").strength.set(-0.000008)
+    sr.design.get_magnet("SH1A-C02-V").strength.set(-0.000017)
 
     o,_ = sr.design.get_lattice().find_orbit()
     assert(np.abs(o[0] + 1.60277642e-04)<1e-10)
diff --git a/tests/test_linkers.py b/tests/test_linkers.py
index 007d66d6..a80b0b5c 100644
--- a/tests/test_linkers.py
+++ b/tests/test_linkers.py
@@ -2,7 +2,6 @@
 
 from pyaml import PyAMLException
 from pyaml.instrument import Instrument
-from pyaml.lattice.element_holder import MagnetType
 
 from pyaml.lattice.attribute_linker import (
     PyAtAttributeElementsLinker,
@@ -19,14 +18,16 @@
 class DummyPyAMLElement:
     """Minimal stand-in for a PyAML Element: only provides .name."""
     def __init__(self, name: str):
-        self.name = name
+        self._name = name
+    def get_name(self) -> str:
+        return self._name
 
 
 def test_conf_with_linker():
     ml:PyAML = pyaml("tests/config/sr-attribute-linker.yaml")
     sr:Instrument = ml.get('sr')
     assert sr is not None
-    magnet = sr.design.get_magnet(MagnetType.HCORRECTOR,"SH1A-C01-H")
+    magnet = sr.design.get_magnet("SH1A-C01-H")
     assert magnet is not None
 
 
diff --git a/tests/test_load_quad.py b/tests/test_load_quad.py
index d6ccfa06..70330827 100644
--- a/tests/test_load_quad.py
+++ b/tests/test_load_quad.py
@@ -6,7 +6,6 @@
 from pyaml import PyAMLException
 from pyaml.configuration import load, set_root_folder, get_root_folder
 from pyaml.configuration import Factory
-from pyaml.lattice.element_holder import MagnetType
 from pyaml.magnet.hcorrector import HCorrector
 from pyaml.magnet.quadrupole import Quadrupole
 from pyaml.magnet.quadrupole import ConfigModel as QuadrupoleConfigModel
diff --git a/tests/test_tune.py b/tests/test_tune.py
index ad12e9dd..d3df17bf 100644
--- a/tests/test_tune.py
+++ b/tests/test_tune.py
@@ -1,7 +1,5 @@
 from pyaml.pyaml import pyaml,PyAML
 from pyaml.instrument import Instrument
-from pyaml.lattice.element_holder import MagnetType
-from pyaml.arrays.magnet_array import MagnetArray
 from pyaml.configuration.factory import Factory
 import numpy as np
 import at
diff --git a/tests/test_tune_hardware.py b/tests/test_tune_hardware.py
index d8f401ba..e5c21a03 100644
--- a/tests/test_tune_hardware.py
+++ b/tests/test_tune_hardware.py
@@ -1,7 +1,5 @@
 from pyaml.pyaml import pyaml,PyAML
 from pyaml.instrument import Instrument
-from pyaml.lattice.element_holder import MagnetType
-from pyaml.arrays.magnet_array import MagnetArray
 from pyaml.configuration.factory import Factory
 import numpy as np
 import at