diff --git a/asterix-app/src/test/resources/runtimets/testsuite.xml b/asterix-app/src/test/resources/runtimets/testsuite.xml
index 945fa09..4ad5ec1 100644
--- a/asterix-app/src/test/resources/runtimets/testsuite.xml
+++ b/asterix-app/src/test/resources/runtimets/testsuite.xml
@@ -4416,13 +4416,11 @@
         <output-dir compare="Text">feeds_04</output-dir>
       </compilation-unit>
     </test-case>
-    <!--
     <test-case FilePath="feeds">
       <compilation-unit name="feeds_05">
         <output-dir compare="Text">feeds_05</output-dir>
       </compilation-unit>
     </test-case>
-    -->
     <test-case FilePath="feeds">
       <compilation-unit name="issue_230_feeds">
         <output-dir compare="Text">issue_230_feeds</output-dir>
diff --git a/asterix-tools/src/main/java/edu/uci/ics/asterix/tools/external/data/TweetGenerator.java b/asterix-tools/src/main/java/edu/uci/ics/asterix/tools/external/data/TweetGenerator.java
index 9c390c1..8f252e6 100644
--- a/asterix-tools/src/main/java/edu/uci/ics/asterix/tools/external/data/TweetGenerator.java
+++ b/asterix-tools/src/main/java/edu/uci/ics/asterix/tools/external/data/TweetGenerator.java
@@ -77,8 +77,10 @@
             numFlushedTweets += frameTweetCount;
             frameTweetCount = 0;
             outputBuffer.put(b);
-            frameTweetCount++;
+        } else {
+            outputBuffer.put(b);
         }
+        frameTweetCount++;
     }
 
     public int getNumFlushedTweets() {
@@ -95,6 +97,9 @@
     public boolean setNextRecordBatch(int numTweetsInBatch) throws Exception {
         boolean moreData = tweetIterator.hasNext();
         if (!moreData) {
+            if (outputBuffer.position() > 0) {
+                flush();
+            }
             if (LOGGER.isLoggable(Level.INFO)) {
                 LOGGER.info("Reached end of batch. Tweet Count: [" + partition + "]" + tweetCount);
             }