diff --git a/tests/API_DoQuery.php b/tests/API_DoQuery.php
index 9db7f3f..195bb48 100644
--- a/tests/API_DoQuery.php
+++ b/tests/API_DoQuery.php
@@ -210,8 +210,7 @@
 	'clist' => '1.2.3.4.5'
 ));
 
-if(!objStrctMatch($actual['table']['records'], $expected['table']['records'])){
-	var_dump($actual['table']['records'], $expected['table']['records']);
+if(!objStrctMatch($actual, $expected)){
 	throw new Exception('Mismatched API_DoQuery Formatted Data Structure');
 }
 
diff --git a/tests/runAll.php b/tests/runAll.php
index 6662bcf..957484e 100644
--- a/tests/runAll.php
+++ b/tests/runAll.php
@@ -78,11 +78,7 @@ function objStrctEquiv($a, $b){
 		$key = $keys[$i];
 		$val = $a[$key];
 
-		if(!isset($b[$key])){
-			return false;
-		}
-
-		if(!objStrctMatch($val, $b[$key])){
+		if(!isset($b[$key]) || !objStrctMatch($val, $b[$key])){
 			return false;
 		}
 	}