diff --git a/src/laybasic/laybasic/gsiDeclLayLayoutViewBase.cc b/src/laybasic/laybasic/gsiDeclLayLayoutViewBase.cc
index 8c4307134..9e9372fb8 100644
--- a/src/laybasic/laybasic/gsiDeclLayLayoutViewBase.cc
+++ b/src/laybasic/laybasic/gsiDeclLayLayoutViewBase.cc
@@ -281,8 +281,6 @@ static void delete_layers1 (lay::LayoutViewBase *view, const std::vector<lay::La
 
 static unsigned int show_layout1 (lay::LayoutViewBase *view, db::Layout *layout, bool add_cellview)
 {
-  //  the layout gets held by the LayoutHandle object
-  layout->keep ();
   lay::LayoutHandle *handle = lay::LayoutHandle::find_layout (layout);
   if (! handle) {
     handle = new lay::LayoutHandle (layout, std::string ());
@@ -292,8 +290,6 @@ static unsigned int show_layout1 (lay::LayoutViewBase *view, db::Layout *layout,
 
 static unsigned int show_layout2 (lay::LayoutViewBase *view, db::Layout *layout, std::string &tech, bool add_cellview)
 {
-  //  the layout gets held by the LayoutHandle object
-  layout->keep ();
   lay::LayoutHandle *handle = lay::LayoutHandle::find_layout (layout);
   if (! handle) {
     handle = new lay::LayoutHandle (layout, std::string ());
@@ -304,8 +300,6 @@ static unsigned int show_layout2 (lay::LayoutViewBase *view, db::Layout *layout,
 
 static unsigned int show_layout3 (lay::LayoutViewBase *view, db::Layout *layout, std::string &tech, bool add_cellview, bool initialize_layers)
 {
-  //  the layout gets held by the LayoutHandle object
-  layout->keep ();
   lay::LayoutHandle *handle = lay::LayoutHandle::find_layout (layout);
   if (! handle) {
     handle = new lay::LayoutHandle (layout, std::string ());
diff --git a/testdata/algo/bipolar_devices_nets.gds b/testdata/algo/bipolar_devices_nets.gds.1
similarity index 100%
rename from testdata/algo/bipolar_devices_nets.gds
rename to testdata/algo/bipolar_devices_nets.gds.1
diff --git a/testdata/algo/bipolar_devices_nets.gds.2 b/testdata/algo/bipolar_devices_nets.gds.2
new file mode 100644
index 000000000..fdd11571f
Binary files /dev/null and b/testdata/algo/bipolar_devices_nets.gds.2 differ
diff --git a/testdata/algo/device_extract_au10.gds.2 b/testdata/algo/device_extract_au10.gds.2
new file mode 100644
index 000000000..34f447f3f
Binary files /dev/null and b/testdata/algo/device_extract_au10.gds.2 differ
diff --git a/testdata/algo/device_extract_au1_flat.gds.3 b/testdata/algo/device_extract_au1_flat.gds.3
new file mode 100644
index 000000000..553f85ea1
Binary files /dev/null and b/testdata/algo/device_extract_au1_flat.gds.3 differ
diff --git a/testdata/algo/device_extract_capres_nets.gds.2 b/testdata/algo/device_extract_capres_nets.gds.2
new file mode 100644
index 000000000..6fc46523c
Binary files /dev/null and b/testdata/algo/device_extract_capres_nets.gds.2 differ
diff --git a/testdata/algo/device_extract_capres_with_bulk_nets.gds b/testdata/algo/device_extract_capres_with_bulk_nets.gds.1
similarity index 100%
rename from testdata/algo/device_extract_capres_with_bulk_nets.gds
rename to testdata/algo/device_extract_capres_with_bulk_nets.gds.1
diff --git a/testdata/algo/device_extract_capres_with_bulk_nets.gds.2 b/testdata/algo/device_extract_capres_with_bulk_nets.gds.2
new file mode 100644
index 000000000..6c6561c9b
Binary files /dev/null and b/testdata/algo/device_extract_capres_with_bulk_nets.gds.2 differ
diff --git a/testdata/drc/drcSimpleTests_au70.gds.3 b/testdata/drc/drcSimpleTests_au70.gds.3
new file mode 100644
index 000000000..9c4d433db
Binary files /dev/null and b/testdata/drc/drcSimpleTests_au70.gds.3 differ
diff --git a/testdata/drc/drcSimpleTests_au70d.gds.3 b/testdata/drc/drcSimpleTests_au70d.gds.3
new file mode 100644
index 000000000..6dd7d40ac
Binary files /dev/null and b/testdata/drc/drcSimpleTests_au70d.gds.3 differ