diff --git a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc
index 75e473fe1..560712df3 100644
--- a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc
+++ b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc
@@ -291,7 +291,7 @@ TEST(16)
   run_test (_this, "def7", "lef:cells.lef+lef:tech.lef+def:in.def.gz", "au-new.oas.gz", options);
 
   options.set_placement_blockage_layer ("PLACEMENT_BLK (60/0)");
-  run_test (_this, "def7", "map:in.map+lef:cells.lef+lef:tech.lef+def:in.def.gz", "au_with_map_file-new.oas.gz", options);
+  run_test (_this, "def7", "map:in.map+lef:cells.lef+lef:tech.lef+def:in.def.gz", "au2_with_map_file-new.oas.gz", options);
 }
 
 TEST(17)
@@ -332,7 +332,7 @@ TEST(21)
 TEST(22)
 {
   db::LEFDEFReaderOptions opt = default_options ();
-  run_test (_this, "def13", "map:test.map+lef:test.lef_5.8+def:top.def.gz", "au.oas.gz", opt);
+  run_test (_this, "def13", "map:test.map+lef:test.lef_5.8+def:top.def.gz", "au2.oas.gz", opt);
 }
 
 TEST(100)
@@ -710,20 +710,26 @@ TEST(117_mapfile_all)
   EXPECT_EQ (lm_read.to_string (),
     "layer_map("
       "'OUTLINE : OUTLINE (1/0)';"
-      "'+M1.LEFOBS;M1.LEFPIN;M1.NET;M1.PIN;M1.SPNET;M1.VIA : \\'M1.NET/PIN/...\\' (1/5)';"
+      "'+M1.LEFOBS;M1.LEFPIN;M1.NET;M1.PIN;M1.SPNET;M1.VIA : \\'M1.NET/PIN/SPNET/...\\' (1/5)';"
       "'+M1.NET;M1.SPNET : \\'M1.NET/SPNET\\' (16/0)';"
       "'+M1.NET : M1.NET (18/0)';"
-      "'+M1.BLK;M1.LEFOBS;M1.LEFPIN;M1.NET;M1.PIN;M1.SPNET;M1.VIA : \\'M1.NET/PIN/...\\' (22/2)';"
-      "'+\\'M1.NET:1\\';\\'M1.PIN:1\\';\\'M1.SPNET:1\\';\\'M1.VIA:1\\' : \\'M1.NET:1/...\\' (6/0)';"
+      "'+M1.BLK;M1.FILL;M1.FILLOPC;M1.LEFOBS;M1.LEFPIN;M1.NET;M1.PIN;M1.SPNET;M1.VIA : \\'M1.NET/PIN/FILL/...\\' (22/2)';"
+      "'+\\'M1.NET:1\\';\\'M1.PIN:1\\';\\'M1.SPNET:1\\';\\'M1.VIA:1\\' : \\'M1.NET:1/PIN:1/...\\' (6/0)';"
       "'+\\'M1.NET:1\\' : \\'M1.NET:1\\' (7/0)';"
       "'+M1.PIN : M1.PIN (3/0)';"
       "'+M1.PIN : M1.PIN (4/0)';"
-      "'+M1.VIA : M1.VIA (20/0)';"
-      "'+M1.VIA : M1.VIA (21/0)';"
+      "'+M1.FILL : M1.FILL (14/0)';"
+      "'+M1.FILL : M1.FILL (15/0)';"
+      "'+M1.FILL : M1.FILL (17/0)';"
+      "'+M1.FILLOPC : M1.FILLOPC (9/0)';"
+      "'\\'M1.FILLOPC:1\\' : \\'M1.FILLOPC:1\\' (10/0)';"
+      "'\\'M1.FILLOPC:2\\' : \\'M1.FILLOPC:2\\' (11/0)';"
+      "'\\'M1.VIA:SIZE0.05X0.05\\' : \\'M1.VIA:SIZE0.05X0.05\\' (20/0)';"
+      "'\\'M1.VIA:SIZE3X3\\' : \\'M1.VIA:SIZE3X3\\' (21/0)';"
       "'+M1.LABEL : M1.LABEL (26/0)';"
       "'+M1.LABEL : M1.LABEL (27/0)';"
       "'+M1.LABEL : M1.LABEL (28/1)';"
-      "'+M1.BLK : M1.BLOCKAGE (13/0)';"
+      "'+M1.BLK : M1.BLK (13/0)';"
       "'M1_TEXT.LABEL : M1_TEXT.LABEL (29/0)'"
     ")"
   )
diff --git a/testdata/lefdef/mapfile/au.oas.gz b/testdata/lefdef/mapfile/au.oas.gz
index 942c568de..bf3c4bea7 100644
Binary files a/testdata/lefdef/mapfile/au.oas.gz and b/testdata/lefdef/mapfile/au.oas.gz differ
diff --git a/testdata/lefdef/masks-2/au.oas.gz b/testdata/lefdef/masks-2/au.oas.gz
index 0cceaa128..bb71f6fe6 100644
Binary files a/testdata/lefdef/masks-2/au.oas.gz and b/testdata/lefdef/masks-2/au.oas.gz differ
diff --git a/testdata/ruby/dbReaders.rb b/testdata/ruby/dbReaders.rb
index 3c6dcb47e..8288d6c43 100644
--- a/testdata/ruby/dbReaders.rb
+++ b/testdata/ruby/dbReaders.rb
@@ -289,6 +289,18 @@ class DBReaders_TestClass < TestBase
     conf.lef_pins_datatype = 181
     assert_equal(conf.lef_pins_datatype, 181)
 
+    assert_equal(conf.produce_fills, true)
+    conf.produce_fills = false
+    assert_equal(conf.produce_fills, false)
+
+    assert_equal(conf.fills_suffix, ".FILL")
+    conf.fills_suffix = "XFILL"
+    assert_equal(conf.fills_suffix, "XFILL")
+
+    assert_equal(conf.fills_datatype, 5)
+    conf.fills_datatype = 19
+    assert_equal(conf.fills_datatype, 19)
+
     assert_equal(conf.produce_obstructions, true)
     conf.produce_obstructions = false
     assert_equal(conf.produce_obstructions, false)