diff --git a/tests/liberty/bundledef.lib b/tests/liberty/bundledef.lib
new file mode 100644
index 000000000..ee891b60f
--- /dev/null
+++ b/tests/liberty/bundledef.lib
@@ -0,0 +1,62 @@
+/* Liberty 2007: example 2-4          */
+/* Direction of pins in bundle groups */
+library(bundle_example) {
+  technology (cmos);
+  revision : 1.0;
+  
+  time_unit                     : "1ps";
+  pulling_resistance_unit       : "1kohm";  
+  voltage_unit                  : "1V";
+  current_unit                  : "1uA";  
+  
+  capacitive_load_unit(1,ff);
+  
+  default_inout_pin_cap         :  7.0;
+  default_input_pin_cap         :  7.0;
+  default_output_pin_cap        :  0.0;
+  default_fanout_load           :  1.0;
+
+  default_wire_load_capacitance : 0.1;
+  default_wire_load_resistance  : 1.0e-3;
+  default_wire_load_area        : 0.0;
+
+  nom_process                   :  1.0;
+  nom_temperature               : 25.0;
+  nom_voltage                   :  1.2;
+  
+  delay_model                   : generic_cmos;
+  
+  cell (inv) {
+    area : 16;
+    cell_leakage_power : 8;
+    bundle (Z) {
+      members (Z0, Z1, Z2, Z3);
+      direction : output;
+      function : "D";
+      pin (Z0) {
+        direction : output;
+        timing () {
+          intrinsic_rise : 0.4;
+          intrinsic_fall : 0.4;
+          related_pin : "D0";
+        }
+      }
+      pin (Z1) {
+        direction : output;
+        timing () {
+          intrinsic_rise : 0.4;
+          intrinsic_fall : 0.4;
+          related_pin : "D1";
+        }
+      }
+    }
+    bundle (D) {
+      members (D0, D1, D2, D3);
+      direction : input;
+      capacitance : 1;
+      pin (D0) {
+        direction : input;
+      }
+    }
+  }
+}
diff --git a/tests/liberty/bundledef.lib.filtered.ok b/tests/liberty/bundledef.lib.filtered.ok
new file mode 100644
index 000000000..e96fa31de
--- /dev/null
+++ b/tests/liberty/bundledef.lib.filtered.ok
@@ -0,0 +1,5 @@
+library(bundle_example) {
+  cell(inv) {
+    area : 16 ;
+  }
+}
diff --git a/tests/liberty/bundledef.lib.verilogsim.ok b/tests/liberty/bundledef.lib.verilogsim.ok
new file mode 100644
index 000000000..04399fa3c
--- /dev/null
+++ b/tests/liberty/bundledef.lib.verilogsim.ok
@@ -0,0 +1,2 @@
+module inv ();
+endmodule
diff --git a/tests/liberty/liberty_define.lib b/tests/liberty/busdef2.lib
similarity index 82%
rename from tests/liberty/liberty_define.lib
rename to tests/liberty/busdef2.lib
index 5346283b7..6ccbbba14 100644
--- a/tests/liberty/liberty_define.lib
+++ b/tests/liberty/busdef2.lib
@@ -1,3 +1,6 @@
+/* Tests two things:                                                      */
+/* (1) Bus without any individual pin definition                          */
+/* (2) Having a custom field with define, which can allow square brackets */
 library (liberty_define) {
   delay_model : "table_lookup" ;
   simulation : false ;
@@ -30,7 +33,6 @@ library (liberty_define) {
   define (original_pin, pin, string) ;
   cell (not_cell) {
     bus (A) {
-      capacitance : 1 ;
       bus_type : "bus8" ;
       direction : "input" ;
     }
diff --git a/tests/liberty/liberty_define.lib.filtered.ok b/tests/liberty/busdef2.lib.filtered.ok
similarity index 100%
rename from tests/liberty/liberty_define.lib.filtered.ok
rename to tests/liberty/busdef2.lib.filtered.ok
diff --git a/tests/liberty/liberty_define.lib.verilogsim.ok b/tests/liberty/busdef2.lib.verilogsim.ok
similarity index 59%
rename from tests/liberty/liberty_define.lib.verilogsim.ok
rename to tests/liberty/busdef2.lib.verilogsim.ok
index 292f64425..b9a8d597a 100644
--- a/tests/liberty/liberty_define.lib.verilogsim.ok
+++ b/tests/liberty/busdef2.lib.verilogsim.ok
@@ -1,5 +1,4 @@
-module not_cell (A, Y);
-  input A;
+module not_cell (Y);
   output Y;
   assign Y = !A[0]; // !A[0]
 endmodule