diff --git a/src/test-harness/tests/twprint.pm b/src/test-harness/tests/twprint.pm
index 7c7fda0..e49b913 100644
--- a/src/test-harness/tests/twprint.pm
+++ b/src/test-harness/tests/twprint.pm
@@ -76,71 +76,78 @@ sub run() {
     # Now run thru the valid report levels & verify return codes
     #  TODO: look for expected result in various report levels
 
-    twtools::RunReport({ report-level => 0 });
+    twtools::RunReport({ report_level => 0 });
     if ( $? != 0 ) {
         twtools::logStatus("level 0 report failed\n");
         $twpassed = 0;
     }
     
-    twtools::RunReport({ report-level => 1 });
+    twtools::RunReport({ report_level => 1 });
     if ( $? != 0 ) {
         twtools::logStatus("level 1 report failed\n");
         $twpassed = 0;
     }
 
-    twtools::RunReport({ report-level => 2 });
+    twtools::RunReport({ report_level => 2 });
     if ( $? != 0 ) {
         twtools::logStatus("level 2 report failed\n");
         $twpassed = 0;
     }
 
-    twtools::RunReport({ report-level => 3 });
+    twtools::RunReport({ report_level => 3 });
     if ( $? != 0 ) {
         twtools::logStatus("level 3 report failed\n");
         $twpassed = 0;
     }
 
-    twtools::RunReport({ report-level => 4 });
+    twtools::RunReport({ report_level => 4 });
     if ( $? != 0 ) {
         twtools::logStatus("level 4 report failed\n");
         $twpassed = 0;
     }
 
-    twtools::RunReport({ report-level => "4 --verbose --hexadecimal" });
+    twtools::RunReport({ report_level => "4 --verbose --hexadecimal" });
     if ( $? != 0 ) {
         twtools::logStatus("level 4 report (verbose, hex) failed\n");
         $twpassed = 0;
     }
 
-    twtools::RunReport({ report-level => "4 --silent" });
+    twtools::RunReport({ report_level => "4 --silent" });
     if ( $? != 0 ) {
         twtools::logStatus("level 4 report (silent) failed\n");
         $twpassed = 0;
     }
 
+    twtools::RunReport({ report_object_list =>  "$twtools::twrootdir/printme.txt" });
+    if ( $? != 0 ) {
+        twtools::logStatus("print-report with an object list failedn");
+        $twpassed = 0;
+    }
+
+
     #########################################################
     #
     # Now some failure cases, to verify they fail
     #
-    twtools::RunReport({ report-level => 5 });
+    twtools::RunReport({ report_level => 5 });
     if ( $? != 256 ) {
         twtools::logStatus("nonexistent level 5 report failed, result = $?\n");
         $twpassed = 0;
     }
 
-    twtools::RunReport({ report-level => "asdf" });
+    twtools::RunReport({ report_level => "asdf" });
     if ( $? != 256 ) {
         twtools::logStatus("nonexistent level 'asdf' report failed, result = $?\n");
         $twpassed = 0;
     }
 
-    twtools::RunReport({ report-level => "0 --help" });
+    twtools::RunReport({ report_level => "0 --help" });
     if ( $? != 256 ) {
         twtools::logStatus("print-report help mode failed, result = $?\n");
         $twpassed = 0;
     }
 
-    twtools::RunReport({ report-level => "4 --verbose --silent" });
+    twtools::RunReport({ report_level => "4 --verbose --silent" });
     if ( $? != 256 ) {
         twtools::logStatus("print-report verbose vs silent failed, result = $?\n");
         $twpassed = 0;
@@ -156,18 +163,37 @@ sub run() {
         $twpassed = 0;
     }
 
-    twtools::RunDbPrint({ db-object-list => "$twtools::twrootdir/printme.txt" });
+    twtools::RunDbPrint({ db_object_list => "$twtools::twrootdir/printme.txt" });
     if ( $? != 0 ) {
-        twtools::logStatus("db print failed\n");
+        twtools::logStatus("db print with an object failed\n");
         $twpassed = 0;
     }
 
-    twtools::RunDbPrint({ db-object-list => "$twtools::twrootdir/nonexistent.vbs" });
+    twtools::RunDbPrint({ db_object_list => "$twtools::twrootdir/nonexistent.vbs" });
     if ( $? != 0 ) {
-        twtools::logStatus("db print failed\n");
+        twtools::logStatus("db print with nonexistent object failed\n");
         $twpassed = 0;
     }
 
+    twtools::RunDbPrint({ db_print_level => 0 });
+    if ( $? != 0 ) {
+        twtools::logStatus("db print level 0 failed\n");
+        $twpassed = 0;
+    }
+
+    twtools::RunDbPrint({ db_print_level => 1 });
+    if ( $? != 0 ) {
+        twtools::logStatus("db print level 1 failed\n");
+        $twpassed = 0;
+    }
+
+    twtools::RunDbPrint({ db_print_level => 2 });
+    if ( $? != 0 ) {
+        twtools::logStatus("db print level 2 failed\n");
+        $twpassed = 0;
+    }
+
+
     #########################################################
     #
     # Now try misc help & version options
diff --git a/src/test-harness/twtools.pm b/src/test-harness/twtools.pm
index 218511d..05e5fb9 100644
--- a/src/test-harness/twtools.pm
+++ b/src/test-harness/twtools.pm
@@ -1,4 +1,3 @@
-
 package twtools;
 
 ######################################################################
@@ -364,11 +363,13 @@ sub UpdatePolicy {
 sub RunReport {
 
     my (%params) = %{$_[0]};
+    my ($reportobjects);
 
     $params{report} = $reportloc if( ! defined($params{report}) );
-    $params{report-level} = 0 if( ! defined($params{report-level}) );
+    $params{report_level} = 0 if( ! defined($params{report_level}) );
+    $params{report_object_list} = "" if( ! defined($params{report_object_list}) );
 
-    my (@out) =  `$twrootdir/bin/twprint -m r -c $twrootdir/$twcfgloc -t $params{report-level} -r $params{report} 2>&1`;
+    my (@out) =  `$twrootdir/bin/twprint -m r -c $twrootdir/$twcfgloc -t $params{report_level} -r $params{report} $params{report_object_list} 2>&1`;
 
     logStatus(@out);
 
@@ -383,9 +384,11 @@ sub RunReport {
 sub RunDbPrint {
 
     my (%params) = %{$_[0]};
-    $params{db-object-list} = "" if( ! defined($params{db-object-list}) );
+ 
+    $params{db_object_list} = "" if( ! defined($params{db_object_list}) );
+    $params{db_print_level} = "2" if( ! defined($params{db_print_level}) );
 
-    my (@out) =  `$twrootdir/bin/twprint -m d -c $twrootdir/$twcfgloc $params{db-object-list} 2>&1`;
+    my (@out) =  `$twrootdir/bin/twprint -m d -c $twrootdir/$twcfgloc -t $params{db_print_level} $params{db_object_list} 2>&1`;
 
     logStatus(@out);