diff --git a/src/db/unit_tests/dbLibrariesTests.cc b/src/db/unit_tests/dbLibrariesTests.cc
index bbe74b65d..d39e025ae 100644
--- a/src/db/unit_tests/dbLibrariesTests.cc
+++ b/src/db/unit_tests/dbLibrariesTests.cc
@@ -794,7 +794,7 @@ TEST(7_monsterlib)
 
   //  all references now need to be resolved
   EXPECT_EQ (num_defunct (layout), size_t (0));
-  EXPECT_EQ (num_cells (layout), size_t (34));
+  EXPECT_EQ (num_cells (layout), size_t (36));
   EXPECT_EQ (num_top_cells (layout), size_t (1));
 
   db::compare_layouts (_this, layout, tl::testsrc () + "/testdata/libman/design_au2.gds", db::NormalizationMode (db::NoNormalization | db::WithoutCellNames | db::AsPolygons));
@@ -807,7 +807,7 @@ TEST(7_monsterlib)
 
   //  all references now need to be resolved
   EXPECT_EQ (num_defunct (layout), size_t (0));
-  EXPECT_EQ (num_cells (layout), size_t (29));
+  EXPECT_EQ (num_cells (layout), size_t (32));
   EXPECT_EQ (num_top_cells (layout), size_t (1));
 
   db::compare_layouts (_this, layout, tl::testsrc () + "/testdata/libman/design_au3.gds", db::NormalizationMode (db::NoNormalization | db::WithoutCellNames | db::AsPolygons));
@@ -816,8 +816,8 @@ TEST(7_monsterlib)
   db::LibraryManager::instance ().delete_lib (lib_noex2);
 
   //  after removing the libraries, we have defunct cells again
-  EXPECT_EQ (num_defunct (layout), size_t (8));
-  EXPECT_EQ (num_cells (layout), size_t (29));
+  EXPECT_EQ (num_defunct (layout), size_t (11));
+  EXPECT_EQ (num_cells (layout), size_t (32));
   EXPECT_EQ (num_top_cells (layout), size_t (1));
 
   //  but the layout did not change
@@ -827,8 +827,8 @@ TEST(7_monsterlib)
   db::LibraryManager::instance ().delete_lib (lib_ex2);
 
   //  after removing all libraries, we have even more defunct cells (i.e. all, except top)
-  EXPECT_EQ (num_defunct (layout), size_t (16));
-  EXPECT_EQ (num_cells (layout), size_t (29));
+  EXPECT_EQ (num_defunct (layout), size_t (19));
+  EXPECT_EQ (num_cells (layout), size_t (32));
   EXPECT_EQ (num_top_cells (layout), size_t (1));
 
   //  but the layout did not change
diff --git a/testdata/libman/design_au2.gds b/testdata/libman/design_au2.gds
index c3e3d4925..d7153f8f4 100644
Binary files a/testdata/libman/design_au2.gds and b/testdata/libman/design_au2.gds differ
diff --git a/testdata/libman/design_au3.gds b/testdata/libman/design_au3.gds
index 10b4c7ba8..a3b7482aa 100644
Binary files a/testdata/libman/design_au3.gds and b/testdata/libman/design_au3.gds differ
diff --git a/testdata/libman/design_au4.gds b/testdata/libman/design_au4.gds
index ee9e07f25..803e4325c 100644
Binary files a/testdata/libman/design_au4.gds and b/testdata/libman/design_au4.gds differ
diff --git a/testdata/libman/design_au5.gds b/testdata/libman/design_au5.gds
index 9f28c5213..892d011db 100644
Binary files a/testdata/libman/design_au5.gds and b/testdata/libman/design_au5.gds differ