diff --git a/asterix-app/src/test/java/edu/uci/ics/asterix/test/aql/TestsUtils.java b/asterix-app/src/test/java/edu/uci/ics/asterix/test/aql/TestsUtils.java
index 2a16f2c..2602707 100644
--- a/asterix-app/src/test/java/edu/uci/ics/asterix/test/aql/TestsUtils.java
+++ b/asterix-app/src/test/java/edu/uci/ics/asterix/test/aql/TestsUtils.java
@@ -51,7 +51,6 @@
         int num = 0;
         int chunkCounter = 0;
         int recordCounter = 0;
-
         try {
 
             while ((lineExpected = readerExpected.readLine()) != null) {
@@ -74,8 +73,15 @@
                 if (recordCounter >= resultArray.length()) {
                     chunkCounter++;
                     recordCounter = 0;
+                    if (chunkCounter >= jArray.length()) {
+                        break;
+                    }
                 }
             }
+
+            while ((lineExpected = readerExpected.readLine()) != null) {
+                // TODO(khurram): Print out the remaining expected file contents
+            }
         } finally {
             readerExpected.close();
         }