diff --git a/src/db/unit_tests/dbHierProcessorTests.cc b/src/db/unit_tests/dbHierProcessorTests.cc
index 217acfc6b..97ff2dfce 100644
--- a/src/db/unit_tests/dbHierProcessorTests.cc
+++ b/src/db/unit_tests/dbHierProcessorTests.cc
@@ -704,13 +704,13 @@ TEST(TwoInputsNot5)
 TEST(TwoInputsAnd6)
 {
   //  Extreme variants (copy, vanishing), AND
-  run_test_bool2 (_this, "hlp6.oas", TMAnd, 100);
+  run_test_bool2 (_this, "hlp6.oas", TMAnd, 120);
 }
 
 TEST(TwoInputsNot6)
 {
   //  Extreme variants (copy, vanishing), NOT
-  run_test_bool2 (_this, "hlp6.oas", TMNot, 101);
+  run_test_bool2 (_this, "hlp6.oas", TMNot, 121);
 }
 
 TEST(TwoInputsAnd7)
@@ -844,13 +844,13 @@ TEST(TwoInputsNotWithSize5)
 TEST(TwoInputsAndWithSize6)
 {
   //  Extreme variants (copy, vanishing), AND
-  run_test_bool2_with_size (_this, "hlp6.oas", TMAnd, 1500, 102);
+  run_test_bool2_with_size (_this, "hlp6.oas", TMAnd, 1500, 122);
 }
 
 TEST(TwoInputsNotWithSize6)
 {
   //  Extreme variants (copy, vanishing), NOT
-  run_test_bool2_with_size (_this, "hlp6.oas", TMNot, 1500, 103);
+  run_test_bool2_with_size (_this, "hlp6.oas", TMNot, 1500, 123);
 }
 
 TEST(TwoInputsAndWithSize7)
diff --git a/testdata/algo/device_extract_au1_flat.gds b/testdata/algo/device_extract_au1_flat.gds
new file mode 100644
index 000000000..1dc09360f
Binary files /dev/null and b/testdata/algo/device_extract_au1_flat.gds differ
diff --git a/testdata/algo/hlp10.oas b/testdata/algo/hlp10.oas
index 0da2e135c..ca1e4a913 100644
Binary files a/testdata/algo/hlp10.oas and b/testdata/algo/hlp10.oas differ
diff --git a/testdata/algo/hlp13.oas b/testdata/algo/hlp13.oas
new file mode 100644
index 000000000..236c9dc32
Binary files /dev/null and b/testdata/algo/hlp13.oas differ
diff --git a/testdata/algo/hlp14.oas b/testdata/algo/hlp14.oas
new file mode 100644
index 000000000..47926a477
Binary files /dev/null and b/testdata/algo/hlp14.oas differ
diff --git a/testdata/algo/hlp3.oas b/testdata/algo/hlp3.oas
index e0574ba5f..e62f42b52 100644
Binary files a/testdata/algo/hlp3.oas and b/testdata/algo/hlp3.oas differ
diff --git a/testdata/algo/hlp4.oas b/testdata/algo/hlp4.oas
index ea722bf01..d19c65ad1 100644
Binary files a/testdata/algo/hlp4.oas and b/testdata/algo/hlp4.oas differ
diff --git a/testdata/algo/hlp5.oas b/testdata/algo/hlp5.oas
index 04963b400..0f4c59bc6 100644
Binary files a/testdata/algo/hlp5.oas and b/testdata/algo/hlp5.oas differ
diff --git a/testdata/algo/hlp6.oas b/testdata/algo/hlp6.oas
index 38a6ae94a..92c5b9f82 100644
Binary files a/testdata/algo/hlp6.oas and b/testdata/algo/hlp6.oas differ
diff --git a/testdata/algo/hlp8.oas b/testdata/algo/hlp8.oas
index 3b9f1acc1..2b6c1947f 100644
Binary files a/testdata/algo/hlp8.oas and b/testdata/algo/hlp8.oas differ