diff --git a/test/parser-tests.js b/test/parser-tests.js
index 91605f6b..1d974ac7 100644
--- a/test/parser-tests.js
+++ b/test/parser-tests.js
@@ -22,6 +22,46 @@ var readyForQueryBuffer = new BufferList()
   .add(Buffer('I'))
   .join(true,'Z');
 
+var commandCompleteBuffer = new BufferList()
+  .addCString("SELECT 3")
+  .join(true,'C');
+
+var addRow = function(bufferList, name, offset) {
+  return bufferList.addCString(name) //field name
+    .addInt32(offset++) //table id
+    .addInt16(offset++) //attribute of column number
+    .addInt32(offset++) //objectId of field's data type
+    .addInt16(offset++) //datatype size
+    .addInt32(offset++) //type modifier
+    .addInt16(0) //format code, 0 => text
+};
+
+
+var oneRowDescBuff = new BufferList()
+  .addInt16(1);
+oneRowDescBuff = addRow(oneRowDescBuff, 'id', 1)
+  .join(true,'T');
+
+var twoRowDesc = new BufferList()
+  .addInt16(2);
+twoRowDesc = addRow(twoRowDesc, 'bang', 1);
+twoRowDesc = addRow(twoRowDesc, 'whoah', 10);
+twoRowBuf = twoRowDesc.join(true, 'T');
+
+
+
+var emptyRowFieldBuf = new BufferList()
+  .addInt16(0)
+  .join(true, 'D');
+
+var oneFieldBuf = new BufferList()
+  .addInt16(1) //number of fields
+  .addInt32(5) //length of bytes of fields
+  .addCString('test')
+  .join(true, 'D');
+
+
+
 var expectedAuthenticationOkayMessage = {
   name: 'AuthenticationOk',
   id: 'R',
@@ -50,6 +90,144 @@ var expectedReadyForQueryMessage = {
   status: 'I'
 };
 
+var expectedCommandCompleteMessage = {
+  length: 13,
+  id: 'C',
+  text: "SELECT 3"
+};
+var emptyRowDescriptionBuffer = new BufferList()
+  .addInt16(0) //number of fields
+  .join(true,'T');
+
+var expectedEmptyRowDescriptionMessage = {
+  name: 'RowDescription',
+  id: 'T',
+  length: 6,
+  fieldCount: 0
+};
+var expectedOneRowMessage = {
+  name: 'RowDescription',
+  id: 'T',
+  length: 27,
+  fieldCount: 1
+};
+
+var expectedTwoRowMessage = {
+  name: 'RowDescription',
+  id: 'T',
+  length: 53,
+  fieldCount: 2
+};
+
+var testForMessage = function(buffer, expectedMessage) {
+  var lastMessage = {};
+  test('recieves and parses ' + expectedMessage.name, function() {
+    var stream = new MemoryStream();
+    var client = new Client({
+      stream: stream
+    });
+    client.connect();
+
+    client.on('message',function(msg) {
+      lastMessage = msg;
+    });
+
+    stream.emit('data', buffer);
+    assert.same(lastMessage, expectedMessage);
+  });
+  return lastMessage;
+};
+
+test('Client', function() {
+  testForMessage(authOkBuffer, expectedAuthenticationOkayMessage);
+  testForMessage(paramStatusBuffer, expectedParameterStatusMessage);
+  testForMessage(backendKeyDataBuffer, expectedBackendKeyDataMessage);
+  testForMessage(readyForQueryBuffer, expectedReadyForQueryMessage);
+  testForMessage(commandCompleteBuffer,expectedCommandCompleteMessage);
+  test('empty row message', function() {
+    var message = testForMessage(emptyRowDescriptionBuffer, expectedEmptyRowDescriptionMessage);
+    test('has no fields', function() {
+      assert.equal(message.fields.length, 0);
+    });
+  });
+
+  test('one row message', function() {
+    var message = testForMessage(oneRowDescBuff, expectedOneRowMessage);
+    test('has one field', function() {
+      assert.equal(message.fields.length, 1);
+    });
+    test('has correct field info', function() {
+      assert.same(message.fields[0], {
+        name: 'id',
+        tableID: 1,
+        columnID: 2,
+        dataType: 3,
+        dataTypeSize: 4,
+        dataTypeModifier: 5,
+        format: 'text'
+      });
+    });
+  });
+
+  test('two row message', function() {
+    var message = testForMessage(twoRowBuf, expectedTwoRowMessage);
+    test('has two fields', function() {
+      assert.equal(message.fields.length, 2);
+    });
+    test('has correct first field', function() {
+      assert.same(message.fields[0], {
+        name: 'bang',
+        tableID: 1,
+        columnID: 2,
+        dataType: 3,
+        dataTypeSize: 4,
+        dataTypeModifier: 5,
+        format: 'text'
+      })
+    });
+    test('has correct second field', function() {
+      assert.same(message.fields[1], {
+        name: 'whoah',
+        tableID: 10,
+        columnID: 11,
+        dataType: 12,
+        dataTypeSize: 13,
+        dataTypeModifier: 14,
+        format: 'text'
+      });
+    });
+
+  });
+
+  test('parsing rows', function() {
+
+    test('parsing empty row', function() {
+      var message = testForMessage(emptyRowFieldBuf, {
+        name: 'DataRow',
+        fieldCount: 0
+      });
+      test('has 0 fields', function() {
+        assert.equal(message.fields.length, 0);
+      });
+    });
+
+    test('parsing data row with fields', function() {
+      var message = testForMessage(oneFieldBuf, {
+        name: 'DataRow',
+        fieldCount: 1
+      });
+      test('has 1 field', function() {
+        assert.equal(message.fields.length, 1);
+      });
+
+      test('field is correct', function() {
+        assert.equal(message.fields[0],'test\0');
+      });
+    });
+
+  });
+});
+
 
 test('Parser on single messages', function() {
   test('parses AuthenticationOk message', function() {
@@ -72,62 +250,23 @@ test('Parser on single messages', function() {
     assert.same(result, expectedReadyForQueryMessage);
   });
 
-
-  var commandCompleteBuffer = new BufferList()
-    .addCString("SELECT 3")
-    .join(true,'C');
-
   test('parses CommandComplete message', function() {
     var result = PARSE(commandCompleteBuffer)[0];
-    assert.same(result, {
-      length: 13,
-      id: 'C',
-      text: "SELECT 3"
-    });
+    assert.same(result, expectedCommandCompleteMessage);
   });
 
-  var emptyRowDescriptionBuffer = new BufferList()
-    .addInt16(0) //number of fields
-    .join(true,'T');
-
   test('parses RowDescriptions', function() {
 
     test('parses empty row description', function() {
       var result = PARSE(emptyRowDescriptionBuffer)[0];
-      assert.same(result, {
-        name: 'RowDescription',
-        id: 'T',
-        length: 6,
-        fieldCount: 0
-      });
-
+      assert.same(result, expectedEmptyRowDescriptionMessage);
       assert.equal(result.fields.length, 0);
-
     });
 
-    var addRow = function(bufferList, name, offset) {
-      return bufferList.addCString(name) //field name
-        .addInt32(offset++) //table id
-        .addInt16(offset++) //attribute of column number
-        .addInt32(offset++) //objectId of field's data type
-        .addInt16(offset++) //datatype size
-        .addInt32(offset++) //type modifier
-        .addInt16(0) //format code, 0 => text
-    };
-
-    var oneRowDescBuff = new BufferList()
-      .addInt16(1);
-    oneRowDescBuff = addRow(oneRowDescBuff, 'id', 1)
-      .join(true,'T');
 
     test('parses single row description',function() {
       var result = PARSE(oneRowDescBuff)[0];
-      assert.same(result, {
-        name: 'RowDescription',
-        id: 'T',
-        length: 27,
-        fieldCount: 1
-      });
+      assert.same(result, expectedOneRowMessage);
 
       assert.equal(result.fields.length, 1);
 
@@ -144,19 +283,9 @@ test('Parser on single messages', function() {
     });
 
     test('parses two row descriptions', function() {
-      var twoRowDesc = new BufferList()
-        .addInt16(2);
-      twoRowDesc = addRow(twoRowDesc, 'bang', 1);
-      twoRowDesc = addRow(twoRowDesc, 'whoah', 10);
-      twoRowBuf = twoRowDesc.join(true, 'T');
 
       var result = PARSE(twoRowBuf)[0];
-      assert.same(result, {
-        name: 'RowDescription',
-        id: 'T',
-        length: 53,
-        fieldCount: 2
-      });
+      assert.same(result, expectedTwoRowMessage);
       assert.equal(result.fields.length, 2);
 
       assert.same(result.fields[0], {
@@ -185,24 +314,24 @@ test('Parser on single messages', function() {
 
   test('parses raw data row buffers', function() {
 
-    var emptyRow = new BufferList()
+    var emptyRowFieldBuf = new BufferList()
       .addInt16(0)
       .join(true, 'D');
 
     test('parses empty data row', function() {
-      var result = PARSE(emptyRow)[0];
+      var result = PARSE(emptyRowFieldBuf)[0];
       assert.equal(result.fieldCount, 0);
       assert.equal(result.fields.length, 0);
     });
 
-    var oneField = new BufferList()
+    var oneFieldBuf = new BufferList()
       .addInt16(1) //number of fields
       .addInt32(5) //length of bytes of fields
       .addCString('test')
       .join(true, 'D');
 
     test('parses single field data row', function() {
-      var result = PARSE(oneField)[0];
+      var result = PARSE(oneFieldBuf)[0];
       assert.equal(result.fieldCount, 1);
       assert.equal(result.fields[0], "test\0");
     });
@@ -215,3 +344,4 @@ test('Parser on single messages', function() {
   });
 
 });
+