diff --git a/tests/ice40/hx1k.cc b/tests/ice40/hx1k.cc
index b7990a8..741c954 100644
--- a/tests/ice40/hx1k.cc
+++ b/tests/ice40/hx1k.cc
@@ -59,7 +59,7 @@
         assert(wire == ctx->getWireByName(name));
         wire_count++;
     }
-    ASSERT_EQ(wire_count, 27690);
+    ASSERT_EQ(wire_count, 32802);
 }
 
 TEST_F(HX1KTest, pip_names)
@@ -70,7 +70,7 @@
         assert(pip == ctx->getPipByName(name));
         pip_count++;
     }
-    ASSERT_EQ(pip_count, 319904);
+    ASSERT_EQ(pip_count, 345504);
 }
 
 TEST_F(HX1KTest, uphill_to_downhill)
diff --git a/tests/ice40/hx8k.cc b/tests/ice40/hx8k.cc
index d5b489e..517df0d 100644
--- a/tests/ice40/hx8k.cc
+++ b/tests/ice40/hx8k.cc
@@ -59,7 +59,7 @@
         assert(wire == ctx->getWireByName(name));
         wire_count++;
     }
-    ASSERT_EQ(wire_count, 135182);
+    ASSERT_EQ(wire_count, 165894);
 }
 
 TEST_F(HX8KTest, pip_names)
@@ -70,7 +70,7 @@
         assert(pip == ctx->getPipByName(name));
         pip_count++;
     }
-    ASSERT_EQ(pip_count, 1652480);
+    ASSERT_EQ(pip_count, 1806080);
 }
 
 TEST_F(HX8KTest, uphill_to_downhill)
diff --git a/tests/ice40/lp1k.cc b/tests/ice40/lp1k.cc
index b258d11..2fdba08 100644
--- a/tests/ice40/lp1k.cc
+++ b/tests/ice40/lp1k.cc
@@ -59,7 +59,7 @@
         assert(wire == ctx->getWireByName(name));
         wire_count++;
     }
-    ASSERT_EQ(wire_count, 27690);
+    ASSERT_EQ(wire_count, 32802);
 }
 
 TEST_F(LP1KTest, pip_names)
@@ -70,7 +70,7 @@
         assert(pip == ctx->getPipByName(name));
         pip_count++;
     }
-    ASSERT_EQ(pip_count, 319904);
+    ASSERT_EQ(pip_count, 345504);
 }
 
 TEST_F(LP1KTest, uphill_to_downhill)
diff --git a/tests/ice40/lp384.cc b/tests/ice40/lp384.cc
index a2d91e7..a030b77 100644
--- a/tests/ice40/lp384.cc
+++ b/tests/ice40/lp384.cc
@@ -59,7 +59,7 @@
         assert(wire == ctx->getWireByName(name));
         wire_count++;
     }
-    ASSERT_EQ(wire_count, 8302);
+    ASSERT_EQ(wire_count, 9830);
 }
 
 TEST_F(LP384Test, pip_names)
@@ -70,7 +70,7 @@
         assert(pip == ctx->getPipByName(name));
         pip_count++;
     }
-    ASSERT_EQ(pip_count, 86864);
+    ASSERT_EQ(pip_count, 94544);
 }
 
 TEST_F(LP384Test, uphill_to_downhill)
diff --git a/tests/ice40/lp8k.cc b/tests/ice40/lp8k.cc
index a1c8c88..7fe6ac3 100644
--- a/tests/ice40/lp8k.cc
+++ b/tests/ice40/lp8k.cc
@@ -59,7 +59,7 @@
         assert(wire == ctx->getWireByName(name));
         wire_count++;
     }
-    ASSERT_EQ(wire_count, 135182);
+    ASSERT_EQ(wire_count, 165894);
 }
 
 TEST_F(LP8KTest, pip_names)
@@ -70,7 +70,7 @@
         assert(pip == ctx->getPipByName(name));
         pip_count++;
     }
-    ASSERT_EQ(pip_count, 1652480);
+    ASSERT_EQ(pip_count, 1806080);
 }
 
 TEST_F(LP8KTest, uphill_to_downhill)
diff --git a/tests/ice40/up5k.cc b/tests/ice40/up5k.cc
index 6761db2..582876e 100644
--- a/tests/ice40/up5k.cc
+++ b/tests/ice40/up5k.cc
@@ -59,7 +59,7 @@
         assert(wire == ctx->getWireByName(name));
         wire_count++;
     }
-    ASSERT_EQ(wire_count, 103391);
+    ASSERT_EQ(wire_count, 124503);
 }
 
 TEST_F(UP5KTest, pip_names)
@@ -70,7 +70,7 @@
         assert(pip == ctx->getPipByName(name));
         pip_count++;
     }
-    ASSERT_EQ(pip_count, 1219104);
+    ASSERT_EQ(pip_count, 1324704);
 }
 
 TEST_F(UP5KTest, uphill_to_downhill)