diff --git a/.gitignore b/.gitignore
index 24f7965d..6da64b9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ ubcpdk/tests/test_components.gds/gds_diff/
 *.sqlite3
 *.png
 *.db
+*.pkl
 .idea/
 poetry.lock
 Pipfile
diff --git a/Makefile b/Makefile
index 47505bcd..2a10907f 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ update:
 	pre-commit autoupdate --bleeding-edge
 
 watch:
-	gf yaml watch
+	gf yaml watch ubcpdk
 
 link:
 	lygadgets_link lygadgets
diff --git a/requirements.txt b/requirements.txt
index 15d4ba77..926f6f6d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,3 @@
--e .==null
 lygadgets==0.1.31
-gdsfactory[full]==5.5.1
+gdsfactory[full]==5.6.1
 modes==1.0.6
diff --git a/ubcpdk/components/add_fiber_array.py b/ubcpdk/components/add_fiber_array.py
index 85731bc2..87232a3a 100644
--- a/ubcpdk/components/add_fiber_array.py
+++ b/ubcpdk/components/add_fiber_array.py
@@ -1,183 +1,13 @@
-from typing import Callable, List, Optional, Tuple
-
-from phidl import device_layout as pd
-from phidl.device_layout import Label
 import gdsfactory as gf
-from gdsfactory.add_labels import get_input_label
-from gdsfactory.cell import cell
-from gdsfactory.component import Component
-from gdsfactory.port import Port
-from gdsfactory.types import ComponentReference, ComponentSpec, CrossSectionSpec
-
-from ubcpdk.config import CONFIG
-from ubcpdk.tech import LAYER
-
+from gdsfactory.dft.siepic import add_fiber_array_siepic
 from ubcpdk.components.grating_couplers import gc_te1550
-from ubcpdk.components.cells import bend_euler, straight
-
-
-def get_input_label_text(
-    port: Port,
-    gc: ComponentReference,
-    gc_index: Optional[int] = None,
-    component_name: Optional[str] = None,
-) -> str:
-    """Return label for port and a grating coupler.
-
-    Args:
-        port: component port.
-        gc: grating coupler reference.
-        gc_index: grating coupler index
-        component_name: optional component name.
-    """
-    polarization = gc.info.get("polarization")
-    wavelength = gc.info.get("wavelength")
-
-    assert polarization.upper() in [
-        "TE",
-        "TM",
-    ], f"Not valid polarization {polarization.upper()} in [TE, TM]"
-    assert (
-        isinstance(wavelength, (int, float)) and 1.0 < wavelength < 2.0
-    ), f"{wavelength} is Not valid 1000 < wavelength < 2000"
-
-    name = component_name or port.parent.metadata_child.get("name")
-    # name = component_name
-    # elif type(port.parent) == Component:
-    # name = port.parent.name
-    # else:
-    # name = port.parent.ref_cell.name
-    # name = name.replace("_", "-")
-
-    label = (
-        f"opt_in_{polarization.upper()}_{int(wavelength*1e3)}_device_"
-        f"{CONFIG.username}_({name})-{gc_index}-{port.name}"
-    )
-    return label
-
 
-def get_input_labels_all(
-    io_gratings,
-    ordered_ports,
-    component_name,
-    layer_label=LAYER.LABEL,
-    gc_port_name: str = "o1",
-) -> List[Label]:
-    """Return list of labels  all component ports."""
-    elements = []
-    for i, g in enumerate(io_gratings):
-        label = get_input_label(
-            port=ordered_ports[i],
-            gc=g,
-            gc_index=i,
-            component_name=component_name,
-            layer_label=layer_label,
-            gc_port_name=gc_port_name,
-        )
-        elements += [label]
 
-    return elements
-
-
-def get_input_labels(
-    io_gratings: List[ComponentReference],
-    ordered_ports: List[Port],
-    component_name: str,
-    layer_label: Tuple[int, int] = LAYER.LABEL,
-    gc_port_name: str = "o1",
-    port_index: int = 1,
-    get_input_label_text_function: Callable = get_input_label_text,
-) -> List[Label]:
-    """Return list of labels for all component ports."""
-    if port_index == -1:
-        return get_input_labels_all(
-            io_gratings=io_gratings,
-            ordered_ports=ordered_ports,
-            component_name=component_name,
-            layer_label=layer_label,
-            gc_port_name=gc_port_name,
-        )
-    gc = io_gratings[port_index]
-    port = ordered_ports[1]
-
-    text = get_input_label_text(
-        port=port, gc=gc, gc_index=port_index, component_name=component_name
-    )
-    layer, texttype = pd._parse_layer(layer_label)
-    label = pd.Label(
-        text=text,
-        position=gc.ports[gc_port_name].midpoint,
-        anchor="o",
-        layer=layer,
-        texttype=texttype,
-    )
-    return [label]
-
-
-@cell
-def add_fiber_array(
-    component: ComponentSpec = straight,
-    component_name: Optional[str] = None,
-    gc_port_name: str = "opt1",
-    get_input_labels_function: Callable = get_input_labels,
-    with_loopback: bool = False,
-    optical_routing_type: int = 0,
-    fanout_length: float = 0.0,
-    grating_coupler: ComponentSpec = gc_te1550,
-    cross_section: CrossSectionSpec = "strip",
-    **kwargs,
-) -> Component:
-    """Returns component with grating couplers and labels on each port.
-
-    Routes all component ports south.
-    Can add align_ports loopback reference structure on the edges.
-
-    Args:
-        component: to connect
-        component_name: for the label
-        gc_port_name: grating coupler input port name 'o1'
-        get_input_labels_function: function to get input labels for grating couplers
-        with_loopback: True, adds loopback structures
-        optical_routing_type: None: autoselection, 0: no extension
-        fanout_length: None  # if None, automatic calculation of fanout length
-        taper_length: length of the taper
-        grating_coupler: grating coupler instance, function or list of functions
-        optical_io_spacing: SPACING_GC
-    """
-    c = gf.Component()
-
-    component = gf.routing.add_fiber_array(
-        component=component,
-        component_name=component_name,
-        grating_coupler=grating_coupler,
-        gc_port_name=gc_port_name,
-        get_input_labels_function=get_input_labels_function,
-        with_loopback=with_loopback,
-        optical_routing_type=optical_routing_type,
-        layer_label=LAYER.LABEL,
-        fanout_length=fanout_length,
-        cross_section=cross_section,
-        bend=bend_euler,
-        **kwargs,
-    )
-    ref = c << component
-    ref.rotate(-90)
-    c.add_ports(ref.ports)
-    c.copy_child_info(component)
-    return c
+add_fiber_array = gf.partial(
+    add_fiber_array_siepic, gc_port_name="opt1", grating_coupler=gc_te1550
+)
 
 
 if __name__ == "__main__":
-    # import ubcpdk.components as pdk
-    # c = gc_te1550()
-
-    # c = straight_no_pins()
-    # c = add_fiber_array(component=c)
-    # c = gc_tm1550()
-    # print(c.get_ports_array())
-    # print(c.ports.keys())
-    # c = pdk.straight()
-    # c = pdk.mzi()
-    # c = add_fiber_array(component=c)
     c = add_fiber_array()
     c.show()
diff --git a/ubcpdk/components/cells.py b/ubcpdk/components/cells.py
index ae998188..3e6eec0a 100644
--- a/ubcpdk/components/cells.py
+++ b/ubcpdk/components/cells.py
@@ -20,9 +20,15 @@ def y_splitter() -> Component:
     add_siepic_labels, label_layer=LAYER.DEVREC, library="Design Kits/ebeam"
 )
 
-straight = gf.partial(gf.components.straight, cross_section="strip", decorator=add_siepic_labels)
-bend_euler = gf.partial(gf.components.bend_euler, cross_section="strip", decorator=add_siepic_labels)
-bend_s = gf.partial(gf.components.bend_s, cross_section="strip", decorator=add_siepic_labels)
+straight = gf.partial(
+    gf.components.straight, cross_section="strip", decorator=add_siepic_labels
+)
+bend_euler = gf.partial(
+    gf.components.bend_euler, cross_section="strip", decorator=add_siepic_labels
+)
+bend_s = gf.partial(
+    gf.components.bend_s, cross_section="strip", decorator=add_siepic_labels
+)
 
 
 dc_broadband_te = gf.partial(
@@ -189,5 +195,5 @@ def ebeam_dc_halfring_straight(
     c = ring_with_crossing()
 
     c = mzi()
-    #c = ebeam_dc_te1550()
+    # c = ebeam_dc_te1550()
     c.show()
diff --git a/ubcpdk/klayout/tech/drc/ELEC463 Doping.lydrc b/ubcpdk/klayout/tech/drc/ELEC463 Doping.lydrc
index cc7e594f..30457a00 100644
--- a/ubcpdk/klayout/tech/drc/ELEC463 Doping.lydrc	
+++ b/ubcpdk/klayout/tech/drc/ELEC463 Doping.lydrc	
@@ -21,7 +21,7 @@ Chip1 process:
  - partial etch on layer Si
  - oxide
  - metal heater
- 
+
 Process Layers
  - Si 1/0
  - Si N++: 24/0
diff --git a/ubcpdk/klayout/tech/drc/ELEC463 Metal Heater.lydrc b/ubcpdk/klayout/tech/drc/ELEC463 Metal Heater.lydrc
index 80af7192..9796fc0e 100644
--- a/ubcpdk/klayout/tech/drc/ELEC463 Metal Heater.lydrc	
+++ b/ubcpdk/klayout/tech/drc/ELEC463 Metal Heater.lydrc	
@@ -21,7 +21,7 @@ Chip1 process:
  - partial etch on layer Si
  - oxide
  - metal heater
- 
+
 Process Layers
  - Si 1/0
  - M Heater: 47/0
diff --git a/ubcpdk/klayout/tech/layers.lyp b/ubcpdk/klayout/tech/layers.lyp
index 04186855..5a9186f3 100644
--- a/ubcpdk/klayout/tech/layers.lyp
+++ b/ubcpdk/klayout/tech/layers.lyp
@@ -17,7 +17,7 @@
   <animation>0</animation>
   <name>Waveguides (silicon)</name>
   <source>*/*@*</source>
-  
+
   <group-members>
   <frame-color>#ff80a8</frame-color>
   <fill-color>#ff80a8</fill-color>
@@ -34,7 +34,7 @@
   <source>1/0@1</source>
   <width>2.0</width>
   </group-members>
-  
+
   <group-members>
   <frame-color>#ff0000</frame-color>
   <fill-color>#ff0000</fill-color>
@@ -50,7 +50,7 @@
   <name>31_Si_p6nm</name>
   <source>31/0@1</source>
   </group-members>
-  
+
   <group-members>
   <frame-color>#80a8ff</frame-color>
   <fill-color>#80a8ff</fill-color>
@@ -68,7 +68,7 @@
   <name>Si - 90 nm rib</name>
   <source>2/0@1</source>
   </group-members>
-  
+
   <group-members>
   <frame-color>#cc80a8</frame-color>
   <fill-color>#cc80a8</fill-color>
@@ -85,9 +85,9 @@
   <source>1/69@1</source>
   <width>2.0</width>
   </group-members>
-  
+
  </properties>
- 
+
  <properties>
   <frame-color>#0000ff</frame-color>
   <fill-color>#0000ff</fill-color>
@@ -103,7 +103,7 @@
   <name>Text</name>
   <source>10/0@1</source>
  </properties>
- 
+
  <properties>
   <frame-color/>
   <fill-color/>
@@ -120,7 +120,7 @@
   <animation>0</animation>
   <name>Doping/Epitaxial growth</name>
   <source>*/*@*</source>
-  
+
   <group-members>
 	<animation>0</animation>
 	<marked>false</marked>
@@ -170,7 +170,7 @@
   <animation>0</animation>
   <name>Metal</name>
   <source>*/*@*</source>
-  
+
  <group-members>
   <frame-color>#ebc634</frame-color>
   <fill-color>#ebc634</fill-color>
@@ -186,7 +186,7 @@
   <name>M1_heater</name>
   <source>11/0@1</source>
  </group-members>
- 
+
  <group-members>
   <frame-color>#3471eb</frame-color>
   <fill-color>#3471eb</fill-color>
@@ -202,7 +202,7 @@
   <name>M2_router</name>
   <source>12/0@1</source>
  </group-members>
- 
+
  <group-members>
   <frame-color>#000000</frame-color>
   <fill-color>#000000</fill-color>
@@ -218,7 +218,7 @@
   <name>M_Open</name>
   <source>13/0@1</source>
  </group-members>
- 
+
  <group-members>
   <frame-color>#000000</frame-color>
   <fill-color>#3a027f</fill-color>
@@ -235,7 +235,7 @@
   <source>40/0@1</source>
  </group-members>
  </properties>
- 
+
  <properties>
   <frame-color>#ffae00</frame-color>
   <fill-color>#ffae00</fill-color>
@@ -251,7 +251,7 @@
   <name>Oxide open (to BOX)</name>
   <source>6/0@1</source>
  </properties>
- 
+
  <properties>
   <frame-color>#8000ff</frame-color>
   <fill-color>#8000ff</fill-color>
@@ -284,7 +284,7 @@
   <name>Deep Trench</name>
   <source>201/0@1</source>
  </properties>
- 
+
  <properties>
   <frame-color>#ff00ff</frame-color>
   <fill-color>#ff00ff</fill-color>
@@ -300,7 +300,7 @@
   <name>SEM</name>
   <source>200/0@1</source>
  </properties>
- 
+
  <properties>
   <frame-color/>
   <fill-color/>
@@ -317,7 +317,7 @@
   <animation>0</animation>
   <name>SiEPIC</name>
   <source>*/*@*</source>
-  
+
  <group-members>
   <frame-color>#004080</frame-color>
   <fill-color>#004080</fill-color>
@@ -364,7 +364,7 @@
   <name>PinRecM</name>
   <source>1/11@1</source>
  </group-members>
-  
+
  <group-members>
   <frame-color>#004080</frame-color>
   <fill-color>#004080</fill-color>
@@ -380,7 +380,7 @@
   <name>FbrTgt</name>
   <source>81/0@1</source>
  </group-members>
- 
+
  <group-members>
   <frame-color>#805000</frame-color>
   <fill-color>#000080</fill-color>
@@ -396,7 +396,7 @@
   <name>Errors</name>
   <source>999/0@1</source>
  </group-members>
- 
+
  <group-members>
   <frame-color>#800057</frame-color>
   <fill-color>#800057</fill-color>
@@ -454,7 +454,7 @@
    <width>1</width>
    <marked>false</marked>
    <animation>0</animation>
-   <name>Si</name>
+   <name>Si_</name>
    <source>1/0@1</source>
   </group-members>
  </properties>
diff --git a/ubcpdk/samples/test_ubc1.py b/ubcpdk/samples/test_ubc1.py
index d41fcda7..35a3dfd1 100644
--- a/ubcpdk/samples/test_ubc1.py
+++ b/ubcpdk/samples/test_ubc1.py
@@ -103,9 +103,18 @@ def test_mask3():
     m << gf.components.rectangle(size=floorplan_size, layer=LAYER.FLOORPLAN)
     return write_mask_gds_with_metadata(m)
 
+    # return m
+
 
 if __name__ == "__main__":
+    # m = test_mask3()
+    # m.write_gds_with_metadata()
+
     m, tm = test_mask1()
-    # m, tm = test_mask2()
-    # m, tm = test_mask3()
+    m, tm = test_mask2()
+    m, tm = test_mask3()
     m.show()
+
+    # c = add_gc(ubcpdk.components.dc_broadband_te())
+    # print(c.to_yaml(with_cells=True, with_ports=True))
+    # c.write_gds_with_metadata()
diff --git a/ubcpdk/tests/test_components.gds/gds_ref/bend_euler_9b8a289a.gds b/ubcpdk/tests/test_components.gds/gds_ref/bend_euler_9b8a289a.gds
new file mode 100644
index 00000000..517ac224
Binary files /dev/null and b/ubcpdk/tests/test_components.gds/gds_ref/bend_euler_9b8a289a.gds differ
diff --git a/ubcpdk/tests/test_components.gds/gds_ref/mzi_6d6faa6c.gds b/ubcpdk/tests/test_components.gds/gds_ref/mzi_6d6faa6c.gds
new file mode 100644
index 00000000..fc02a19c
Binary files /dev/null and b/ubcpdk/tests/test_components.gds/gds_ref/mzi_6d6faa6c.gds differ
diff --git a/ubcpdk/tests/test_components.gds/gds_ref/ring_single_dut_16806306.gds b/ubcpdk/tests/test_components.gds/gds_ref/ring_single_dut_16806306.gds
new file mode 100644
index 00000000..95674f5e
Binary files /dev/null and b/ubcpdk/tests/test_components.gds/gds_ref/ring_single_dut_16806306.gds differ
diff --git a/ubcpdk/tests/test_components.gds/gds_ref/straight_cb4e6ca2.gds b/ubcpdk/tests/test_components.gds/gds_ref/straight_cb4e6ca2.gds
new file mode 100644
index 00000000..7f6e6118
Binary files /dev/null and b/ubcpdk/tests/test_components.gds/gds_ref/straight_cb4e6ca2.gds differ
diff --git a/ubcpdk/tests/test_components.gds/gds_ref/straight_cb4e6ca2_add_f_bf7d2a81.gds b/ubcpdk/tests/test_components.gds/gds_ref/straight_cb4e6ca2_add_f_bf7d2a81.gds
new file mode 100644
index 00000000..62b844e9
Binary files /dev/null and b/ubcpdk/tests/test_components.gds/gds_ref/straight_cb4e6ca2_add_f_bf7d2a81.gds differ
diff --git a/ubcpdk/tests/test_components/test_pdk_settings_add_fiber_array_.yml b/ubcpdk/tests/test_components/test_pdk_settings_add_fiber_array_.yml
index 743f7b30..858ca103 100644
--- a/ubcpdk/tests/test_components/test_pdk_settings_add_fiber_array_.yml
+++ b/ubcpdk/tests/test_components/test_pdk_settings_add_fiber_array_.yml
@@ -1,28 +1,29 @@
-name: straight_fdb9781f_add_f_593c9075
+name: straight_cb4e6ca2_add_f_bf7d2a81
 settings:
-  changed: {}
+  changed:
+    gc_port_name: opt1
+    grating_coupler:
+      function: import_gds
+      settings:
+        decorator:
+        - function: add_ports_from_siepic_pins
+        - function: rotate
+          settings:
+            angle: 180
+        flatten: true
+        gdsdir: gds
+        gdspath: ebeam_gc_te1550.gds
+        layout_model_port_pairs:
+        - - opt1
+          - opt_wg
+        library: Design kits/ebeam
+        model: ebeam_gc_te1550
+        name: ebeam_gc_te1550
+        polarization: te
+        wavelength: 1.55
   child:
     changed:
-      bend:
-      - function: bend_euler
-        settings:
-          cross_section: strip
-      - function: add_siepic_labels
-        settings:
-          label_layer:
-          - 68
-          - 0
-          library: Design Kits/ebeam
-      component:
-      - function: straight
-        settings:
-          cross_section: strip
-      - function: add_siepic_labels
-        settings:
-          label_layer:
-          - 68
-          - 0
-          library: Design Kits/ebeam
+      component: straight
       cross_section: strip
       fanout_length: 0
       gc_port_name: opt1
@@ -53,6 +54,13 @@ settings:
     child:
       changed:
         cross_section: strip
+        decorator:
+          function: add_siepic_labels
+          settings:
+            label_layer:
+            - 68
+            - 0
+            library: Design Kits/ebeam
       child: null
       default:
         cross_section:
@@ -63,6 +71,13 @@ settings:
         with_bbox: false
       full:
         cross_section: strip
+        decorator:
+          function: add_siepic_labels
+          settings:
+            label_layer:
+            - 68
+            - 0
+            library: Design Kits/ebeam
         length: 10
         npoints: 2
         with_bbox: false
@@ -94,10 +109,9 @@ settings:
         width: 0.5
       info_version: 2
       module: gdsfactory.components.straight
-      name: straight_fdb9781f
+      name: straight_cb4e6ca2
     default:
-      bend:
-        function: bend_euler
+      bend: bend_euler
       component: mmi2x2
       component_name: null
       cross_section:
@@ -122,26 +136,8 @@ settings:
       straight:
         function: straight
     full:
-      bend:
-      - function: bend_euler
-        settings:
-          cross_section: strip
-      - function: add_siepic_labels
-        settings:
-          label_layer:
-          - 68
-          - 0
-          library: Design Kits/ebeam
-      component:
-      - function: straight
-        settings:
-          cross_section: strip
-      - function: add_siepic_labels
-        settings:
-          label_layer:
-          - 68
-          - 0
-          library: Design Kits/ebeam
+      bend: bend_euler
+      component: straight
       component_name: null
       cross_section: strip
       fanout_length: 0
@@ -183,56 +179,27 @@ settings:
     info: {}
     info_version: 2
     module: gdsfactory.routing.add_fiber_array
-    name: straight_fdb9781f_add_f_db57b34c
+    name: straight_cb4e6ca2_add_f_b6c44ecb
   default:
-    component:
-    - function: straight
-      settings:
-        cross_section: strip
-    - function: add_siepic_labels
-      settings:
-        label_layer:
-        - 68
-        - 0
-        library: Design Kits/ebeam
+    component: straight
     component_name: null
     cross_section: strip
     fanout_length: 0
-    gc_port_name: opt1
+    gc_port_name: o1
     get_input_labels_function:
       function: get_input_labels
     grating_coupler:
-      function: import_gds
+      function: grating_coupler_elliptical_trenches
       settings:
-        decorator:
-        - function: add_ports_from_siepic_pins
-        - function: rotate
-          settings:
-            angle: 180
-        flatten: true
-        gdsdir: gds
-        gdspath: ebeam_gc_te1550.gds
-        layout_model_port_pairs:
-        - - opt1
-          - opt_wg
-        library: Design kits/ebeam
-        model: ebeam_gc_te1550
-        name: ebeam_gc_te1550
         polarization: te
-        wavelength: 1.55
+        taper_angle: 35
+    layer_label:
+    - 10
+    - 0
     optical_routing_type: 0
     with_loopback: false
   full:
-    component:
-    - function: straight
-      settings:
-        cross_section: strip
-    - function: add_siepic_labels
-      settings:
-        label_layer:
-        - 68
-        - 0
-        library: Design Kits/ebeam
+    component: straight
     component_name: null
     cross_section: strip
     fanout_length: 0
@@ -258,11 +225,14 @@ settings:
         name: ebeam_gc_te1550
         polarization: te
         wavelength: 1.55
+    layer_label:
+    - 10
+    - 0
     optical_routing_type: 0
     with_loopback: false
-  function_name: add_fiber_array
+  function_name: add_fiber_array_siepic
   info: {}
   info_version: 2
-  module: ubcpdk.components.add_fiber_array
-  name: straight_fdb9781f_add_f_593c9075
+  module: gdsfactory.dft.siepic
+  name: straight_cb4e6ca2_add_f_bf7d2a81
 version: 0.0.1
diff --git a/ubcpdk/tests/test_components/test_pdk_settings_bend_euler_.yml b/ubcpdk/tests/test_components/test_pdk_settings_bend_euler_.yml
index bc8566eb..de5da205 100644
--- a/ubcpdk/tests/test_components/test_pdk_settings_bend_euler_.yml
+++ b/ubcpdk/tests/test_components/test_pdk_settings_bend_euler_.yml
@@ -1,6 +1,13 @@
-name: bend_euler
+name: bend_euler_9b8a289a
 settings:
-  changed: {}
+  changed:
+    decorator:
+      function: add_siepic_labels
+      settings:
+        label_layer:
+        - 68
+        - 0
+        library: Design Kits/ebeam
   child: null
   default:
     angle: 90
@@ -13,6 +20,13 @@ settings:
   full:
     angle: 90
     cross_section: strip
+    decorator:
+      function: add_siepic_labels
+      settings:
+        label_layer:
+        - 68
+        - 0
+        library: Design Kits/ebeam
     direction: ccw
     npoints: 720
     p: 0.5
@@ -48,5 +62,5 @@ settings:
     - wg_width
   info_version: 2
   module: gdsfactory.components.bend_euler
-  name: bend_euler
+  name: bend_euler_9b8a289a
 version: 0.0.1
diff --git a/ubcpdk/tests/test_components/test_pdk_settings_gc_te1310_.yml b/ubcpdk/tests/test_components/test_pdk_settings_gc_te1310_.yml
index f492030b..c9193cdc 100644
--- a/ubcpdk/tests/test_components/test_pdk_settings_gc_te1310_.yml
+++ b/ubcpdk/tests/test_components/test_pdk_settings_gc_te1310_.yml
@@ -19,6 +19,7 @@ settings:
   default:
     cellname: null
     gdsdir: null
+    read_metadata: true
     snap_to_grid_nm: null
   full:
     cellname: null
@@ -35,6 +36,7 @@ settings:
     library: Design kits/ebeam
     model: ebeam_gc_te1310
     polarization: te
+    read_metadata: true
     snap_to_grid_nm: null
     wavelength: 1.31
   function_name: import_gds
diff --git a/ubcpdk/tests/test_components/test_pdk_settings_gc_te1550_.yml b/ubcpdk/tests/test_components/test_pdk_settings_gc_te1550_.yml
index f84470a9..b6d60558 100644
--- a/ubcpdk/tests/test_components/test_pdk_settings_gc_te1550_.yml
+++ b/ubcpdk/tests/test_components/test_pdk_settings_gc_te1550_.yml
@@ -19,6 +19,7 @@ settings:
   default:
     cellname: null
     gdsdir: null
+    read_metadata: true
     snap_to_grid_nm: null
   full:
     cellname: null
@@ -35,6 +36,7 @@ settings:
     library: Design kits/ebeam
     model: ebeam_gc_te1550
     polarization: te
+    read_metadata: true
     snap_to_grid_nm: null
     wavelength: 1.55
   function_name: import_gds
diff --git a/ubcpdk/tests/test_components/test_pdk_settings_gc_te1550_broadband_.yml b/ubcpdk/tests/test_components/test_pdk_settings_gc_te1550_broadband_.yml
index d2823795..28cd453b 100644
--- a/ubcpdk/tests/test_components/test_pdk_settings_gc_te1550_broadband_.yml
+++ b/ubcpdk/tests/test_components/test_pdk_settings_gc_te1550_broadband_.yml
@@ -19,6 +19,7 @@ settings:
   default:
     cellname: null
     gdsdir: null
+    read_metadata: true
     snap_to_grid_nm: null
   full:
     cellname: null
@@ -35,6 +36,7 @@ settings:
     library: Design kits/ebeam
     model: ebeam_gc_te1550_broadband
     polarization: te
+    read_metadata: true
     snap_to_grid_nm: null
     wavelength: 1.55
   function_name: import_gds
diff --git a/ubcpdk/tests/test_components/test_pdk_settings_gc_tm1550_.yml b/ubcpdk/tests/test_components/test_pdk_settings_gc_tm1550_.yml
index 50402d3b..5df70221 100644
--- a/ubcpdk/tests/test_components/test_pdk_settings_gc_tm1550_.yml
+++ b/ubcpdk/tests/test_components/test_pdk_settings_gc_tm1550_.yml
@@ -19,6 +19,7 @@ settings:
   default:
     cellname: null
     gdsdir: null
+    read_metadata: true
     snap_to_grid_nm: null
   full:
     cellname: null
@@ -35,6 +36,7 @@ settings:
     library: Design kits/ebeam
     model: ebeam_gc_tm1550
     polarization: tm
+    read_metadata: true
     snap_to_grid_nm: null
     wavelength: 1.55
   function_name: import_gds
diff --git a/ubcpdk/tests/test_components/test_pdk_settings_mzi_.yml b/ubcpdk/tests/test_components/test_pdk_settings_mzi_.yml
index 668496ba..2235c941 100644
--- a/ubcpdk/tests/test_components/test_pdk_settings_mzi_.yml
+++ b/ubcpdk/tests/test_components/test_pdk_settings_mzi_.yml
@@ -1,16 +1,17 @@
-name: mzi_b26cff02
+name: mzi_6d6faa6c
 settings:
   changed:
     bend:
-    - function: bend_euler
+      function: bend_euler
       settings:
         cross_section: strip
-    - function: add_siepic_labels
-      settings:
-        label_layer:
-        - 68
-        - 0
-        library: Design Kits/ebeam
+        decorator:
+          function: add_siepic_labels
+          settings:
+            label_layer:
+            - 68
+            - 0
+            library: Design Kits/ebeam
     cross_section: strip
     port_e0_combiner: opt3
     port_e0_splitter: opt3
@@ -35,15 +36,16 @@ settings:
         model: ebeam_y_1550
         name: ebeam_y_1550
     straight:
-    - function: straight
+      function: straight
       settings:
         cross_section: strip
-    - function: add_siepic_labels
-      settings:
-        label_layer:
-        - 68
-        - 0
-        library: Design Kits/ebeam
+        decorator:
+          function: add_siepic_labels
+          settings:
+            label_layer:
+            - 68
+            - 0
+            library: Design Kits/ebeam
   child: null
   default:
     bend:
@@ -70,15 +72,16 @@ settings:
     with_splitter: true
   full:
     bend:
-    - function: bend_euler
+      function: bend_euler
       settings:
         cross_section: strip
-    - function: add_siepic_labels
-      settings:
-        label_layer:
-        - 68
-        - 0
-        library: Design Kits/ebeam
+        decorator:
+          function: add_siepic_labels
+          settings:
+            label_layer:
+            - 68
+            - 0
+            library: Design Kits/ebeam
     combiner: null
     cross_section: strip
     delta_length: 10
@@ -108,15 +111,16 @@ settings:
         model: ebeam_y_1550
         name: ebeam_y_1550
     straight:
-    - function: straight
+      function: straight
       settings:
         cross_section: strip
-    - function: add_siepic_labels
-      settings:
-        label_layer:
-        - 68
-        - 0
-        library: Design Kits/ebeam
+        decorator:
+          function: add_siepic_labels
+          settings:
+            label_layer:
+            - 68
+            - 0
+            library: Design Kits/ebeam
     straight_x_bot: null
     straight_x_top: null
     straight_y: null
@@ -125,5 +129,5 @@ settings:
   info: {}
   info_version: 2
   module: gdsfactory.components.mzi
-  name: mzi_b26cff02
+  name: mzi_6d6faa6c
 version: 0.0.1
diff --git a/ubcpdk/tests/test_components/test_pdk_settings_ring_with_crossing_.yml b/ubcpdk/tests/test_components/test_pdk_settings_ring_with_crossing_.yml
index 630684b6..29fb5a69 100644
--- a/ubcpdk/tests/test_components/test_pdk_settings_ring_with_crossing_.yml
+++ b/ubcpdk/tests/test_components/test_pdk_settings_ring_with_crossing_.yml
@@ -1,16 +1,17 @@
-name: ring_single_dut_7f6b4934
+name: ring_single_dut_16806306
 settings:
   changed:
     bend:
-    - function: bend_euler
+      function: bend_euler
       settings:
         cross_section: strip
-    - function: add_siepic_labels
-      settings:
-        label_layer:
-        - 68
-        - 0
-        library: Design Kits/ebeam
+        decorator:
+          function: add_siepic_labels
+          settings:
+            label_layer:
+            - 68
+            - 0
+            library: Design Kits/ebeam
     component:
       function: import_gds
       settings:
@@ -69,15 +70,16 @@ settings:
         width: 0.5
     port_name: opt4
     straight:
-    - function: straight
+      function: straight
       settings:
         cross_section: strip
-    - function: add_siepic_labels
-      settings:
-        label_layer:
-        - 68
-        - 0
-        library: Design Kits/ebeam
+        decorator:
+          function: add_siepic_labels
+          settings:
+            label_layer:
+            - 68
+            - 0
+            library: Design Kits/ebeam
   child: {}
   default:
     bend:
@@ -98,15 +100,16 @@ settings:
     with_component: true
   full:
     bend:
-    - function: bend_euler
+      function: bend_euler
       settings:
         cross_section: strip
-    - function: add_siepic_labels
-      settings:
-        label_layer:
-        - 68
-        - 0
-        library: Design Kits/ebeam
+        decorator:
+          function: add_siepic_labels
+          settings:
+            label_layer:
+            - 68
+            - 0
+            library: Design Kits/ebeam
     component:
       function: import_gds
       settings:
@@ -171,19 +174,20 @@ settings:
     port_name: opt4
     radius: 5
     straight:
-    - function: straight
+      function: straight
       settings:
         cross_section: strip
-    - function: add_siepic_labels
-      settings:
-        label_layer:
-        - 68
-        - 0
-        library: Design Kits/ebeam
+        decorator:
+          function: add_siepic_labels
+          settings:
+            label_layer:
+            - 68
+            - 0
+            library: Design Kits/ebeam
     with_component: true
   function_name: ring_single_dut
   info: {}
   info_version: 2
   module: gdsfactory.components.ring_single_dut
-  name: ring_single_dut_7f6b4934
+  name: ring_single_dut_16806306
 version: 0.0.1
diff --git a/ubcpdk/tests/test_components/test_pdk_settings_straight_.yml b/ubcpdk/tests/test_components/test_pdk_settings_straight_.yml
index e58119c2..425fa95b 100644
--- a/ubcpdk/tests/test_components/test_pdk_settings_straight_.yml
+++ b/ubcpdk/tests/test_components/test_pdk_settings_straight_.yml
@@ -1,7 +1,14 @@
-name: straight_fdb9781f
+name: straight_cb4e6ca2
 settings:
   changed:
     cross_section: strip
+    decorator:
+      function: add_siepic_labels
+      settings:
+        label_layer:
+        - 68
+        - 0
+        library: Design Kits/ebeam
   child: null
   default:
     cross_section:
@@ -12,6 +19,13 @@ settings:
     with_bbox: false
   full:
     cross_section: strip
+    decorator:
+      function: add_siepic_labels
+      settings:
+        label_layer:
+        - 68
+        - 0
+        library: Design Kits/ebeam
     length: 10
     npoints: 2
     with_bbox: false
@@ -43,5 +57,5 @@ settings:
     width: 0.5
   info_version: 2
   module: gdsfactory.components.straight
-  name: straight_fdb9781f
+  name: straight_cb4e6ca2
 version: 0.0.1