diff --git a/src/rdb/unit_tests/rdbRVEReaderTests.cc b/src/rdb/unit_tests/rdbRVEReaderTests.cc
index 4a22a8e2e..66368ae81 100644
--- a/src/rdb/unit_tests/rdbRVEReaderTests.cc
+++ b/src/rdb/unit_tests/rdbRVEReaderTests.cc
@@ -69,15 +69,15 @@ void run_rve_test (tl::TestBase *_this, const std::string &fn_rve, const std::st
 
 TEST(1)
 {
-  run_rve_test (_this, "rve1.db", "rve1_au.txt");
+  run_rve_test (_this, "rve1.db", "rve1_au_2.txt");
 }
 
 TEST(2)
 {
-  run_rve_test (_this, "rve2.db", "rve2_au.txt");
+  run_rve_test (_this, "rve2.db", "rve2_au_2.txt");
 }
 
 TEST(3)
 {
-  run_rve_test (_this, "rve3.db", "rve3_au.txt");
+  run_rve_test (_this, "rve3.db", "rve3_au_2.txt");
 }
diff --git a/testdata/drc/drcSimpleTests_au14b.lyrdb b/testdata/drc/drcSimpleTests_au14b.lyrdb
index 0b6c00a9d..e025e989e 100644
--- a/testdata/drc/drcSimpleTests_au14b.lyrdb
+++ b/testdata/drc/drcSimpleTests_au14b.lyrdb
@@ -24,6 +24,7 @@
   <cell>
    <name>TOP</name>
    <variant/>
+   <layout-name/>
    <references>
    </references>
   </cell>
@@ -35,6 +36,7 @@
    <cell>TOP</cell>
    <visited>false</visited>
    <multiplicity>1</multiplicity>
+   <comment/>
    <image/>
    <values>
     <value>edge-pair: (-0.2,0.7;1,0.7)|(1,1.1;-0.2,1.1)</value>
@@ -46,6 +48,7 @@
    <cell>TOP</cell>
    <visited>false</visited>
    <multiplicity>1</multiplicity>
+   <comment/>
    <image/>
    <values>
     <value>edge-pair: (0,0;0,0.9)|(0.3,0.9;0.3,0)</value>
@@ -57,6 +60,7 @@
    <cell>TOP</cell>
    <visited>false</visited>
    <multiplicity>1</multiplicity>
+   <comment/>
    <image/>
    <values>
     <value>edge-pair: (0.3,0;0,0)|(0,0.9;0.3,0.9)</value>
@@ -68,6 +72,7 @@
    <cell>TOP</cell>
    <visited>false</visited>
    <multiplicity>1</multiplicity>
+   <comment/>
    <image/>
    <values>
     <value>edge-pair: (0.5,0;0.5,0.9)|(0.8,0.9;0.8,0)</value>
@@ -79,6 +84,7 @@
    <cell>TOP</cell>
    <visited>false</visited>
    <multiplicity>1</multiplicity>
+   <comment/>
    <image/>
    <values>
     <value>edge-pair: (0.8,0;0.5,0)|(0.5,0.9;0.8,0.9)</value>
diff --git a/testdata/drc/drcSimpleTests_au14b_2.lyrdb b/testdata/drc/drcSimpleTests_au14b_2.lyrdb
index f3430532f..71743b100 100644
--- a/testdata/drc/drcSimpleTests_au14b_2.lyrdb
+++ b/testdata/drc/drcSimpleTests_au14b_2.lyrdb
@@ -18,6 +18,7 @@
   <cell>
    <name>TOP</name>
    <variant/>
+   <layout-name/>
    <references>
    </references>
   </cell>
@@ -29,6 +30,7 @@
    <cell>TOP</cell>
    <visited>false</visited>
    <multiplicity>1</multiplicity>
+   <comment/>
    <image/>
    <values>
     <value>edge-pair: (0,0.9;0.3,0.9)/(1,1.1;-0.2,1.1)</value>
@@ -40,6 +42,7 @@
    <cell>TOP</cell>
    <visited>false</visited>
    <multiplicity>1</multiplicity>
+   <comment/>
    <image/>
    <values>
     <value>edge-pair: (0.5,0.9;0.8,0.9)/(1,1.1;-0.2,1.1)</value>