diff --git a/lib/types/binaryParsers.js b/lib/types/binaryParsers.js
index ca55cc4ed..7d3319e8f 100644
--- a/lib/types/binaryParsers.js
+++ b/lib/types/binaryParsers.js
@@ -1,3 +1,6 @@
+var ref = require('ref');
+var endian = (ref.endianness === 'LE') ? 'BE' : 'LE';
+
 var parseBits = function(data, bits, offset, invert, callback) {
   offset = offset || 0;
   invert = invert || false;
@@ -106,11 +109,7 @@ var parseInt32 = function(value) {
 };
 
 var parseInt64 = function(value) {
-  if (parseBits(value, 1) == 1) {
-    return -1 * (parseBits(value, 63, 1, true) + 1);
-  }
-
-  return parseBits(value, 63, 1);
+  return String(ref['readInt64' + endian](value, 0));
 };
 
 var parseFloat32 = function(value) {
diff --git a/lib/types/textParsers.js b/lib/types/textParsers.js
index 558ce73be..54d06bf9f 100644
--- a/lib/types/textParsers.js
+++ b/lib/types/textParsers.js
@@ -162,11 +162,20 @@ var parseInteger = function(val) {
   return parseInt(val, 10);
 };
 
+var parseBigInteger = function(val) {
+  var valStr = String(val);
+  if (/^\d+$/.test(valStr)) { return valStr; }
+  return val;
+};
+
 var init = function(register) {
-  register(20, parseInteger);
-  register(21, parseInteger);
-  register(23, parseInteger);
-  register(26, parseInteger);
+  register(20, parseBigInteger); // int8
+  register(21, parseInteger); // int2
+  register(23, parseInteger); // int4
+  register(26, parseInteger); // oid
+  register(700, parseFloat); // float4/real
+  register(701, parseFloat); // float8/double
+  //register(1700, parseString); // numeric/decimal
   register(16, parseBool);
   register(1082, parseDate); // date
   register(1114, parseDate); // timestamp without timezone
diff --git a/package.json b/package.json
index d78afbb68..b6689ec71 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,8 @@
   "main": "./lib",
   "dependencies": {
     "generic-pool": "2.0.3",
-    "buffer-writer": "1.0.0"
+    "buffer-writer": "1.0.0",
+    "ref": "0.1.3"
   },
   "devDependencies": {
     "jshint": "1.1.0",
diff --git a/test/integration/client/type-coercion-tests.js b/test/integration/client/type-coercion-tests.js
index 61204cf09..809226c07 100644
--- a/test/integration/client/type-coercion-tests.js
+++ b/test/integration/client/type-coercion-tests.js
@@ -23,7 +23,9 @@ var testForTypeCoercion = function(type){
           });
 
           assert.emits(query, 'row', function(row) {
-            assert.strictEqual(row.col, val, "expected " + type.name + " of " + val + " but got " + row.col);
+            var expected = val + " (" + typeof val + ")";
+            var returned = row.col + " (" + typeof row.col + ")";
+            assert.strictEqual(row.col, val, "expected " + type.name + " of " + expected + " but got " + returned);
           }, "row should have been called for " + type.name + " of " + val);
 
           client.query('delete from test_type');
@@ -40,13 +42,21 @@ var testForTypeCoercion = function(type){
 
 var types = [{
   name: 'integer',
-  values: [1, -1, null]
+  values: [-2147483648, -1, 0, 1, 2147483647, null]
 },{
   name: 'smallint',
-  values: [-1, 0, 1, null]
+  values: [-32768, -1, 0, 1, 32767, null]
 },{
   name: 'bigint',
-  values: [-10000, 0, 10000, null]
+  values: [
+    '-9223372036854775808',
+    '-9007199254740992',
+    '0',
+    '9007199254740992',
+    '72057594037928030',
+    '9223372036854775807',
+    null
+  ]
 },{
   name: 'varchar(5)',
   values: ['yo', '', 'zomg!', null]
@@ -58,13 +68,20 @@ var types = [{
   values: [true, false, null]
 },{
   name: 'numeric',
-  values: ['-12.34', '0', '12.34', null]
+  values: [
+    '-12.34',
+    '0',
+    '12.34',
+    '-3141592653589793238462643383279502.1618033988749894848204586834365638',
+    '3141592653589793238462643383279502.1618033988749894848204586834365638',
+    null
+  ]
 },{
   name: 'real',
-  values: ['101.1', '0', '-101.3', null]
+  values: [-101.3, -1.2, 0, 1.2, 101.1, null]
 },{
   name: 'double precision',
-  values: ['-1.2', '0', '1.2', null]
+  values: [-101.3, -1.2, 0, 1.2, 101.1, null]
 },{
   name: 'timestamptz',
   values: [null]
@@ -82,7 +99,7 @@ var types = [{
 // ignore some tests in binary mode
 if (helper.config.binary) {
   types = types.filter(function(type) {
-    return !(type.name in {'real':1, 'timetz':1, 'time':1, 'numeric': 1, 'double precision': 1});
+    return !(type.name in {'real': 1, 'timetz':1, 'time':1, 'numeric': 1});
   });
 }
 
diff --git a/test/unit/client/typed-query-results-tests.js b/test/unit/client/typed-query-results-tests.js
index ab48137b2..a5e751a55 100644
--- a/test/unit/client/typed-query-results-tests.js
+++ b/test/unit/client/typed-query-results-tests.js
@@ -1,5 +1,5 @@
 var helper = require(__dirname + '/test-helper');
-//http://www.postgresql.org/docs/8.4/static/datatype.html
+//http://www.postgresql.org/docs/9.2/static/datatype.html
 test('typed results', function() {
   var client = helper.client();
   var con = client.connection;
@@ -18,20 +18,20 @@ test('typed results', function() {
     name: 'integer/int4',
     format: 'text',
     dataTypeID: 23,
-    actual: '100',
-    expected: 100
+    actual: '2147483647',
+    expected: 2147483647
   },{
     name: 'smallint/int2',
     format: 'text',
     dataTypeID: 21,
-    actual: '101',
-    expected: 101
+    actual: '32767',
+    expected: 32767
   },{
     name: 'bigint/int8',
     format: 'text',
     dataTypeID: 20,
-    actual: '102',
-    expected: 102
+    actual: '9223372036854775807',
+    expected: '9223372036854775807'
   },{
     name: 'oid',
     format: 'text',
@@ -42,20 +42,20 @@ test('typed results', function() {
     name: 'numeric',
     format: 'text',
     dataTypeID: 1700,
-    actual: '12.34',
-    expected: '12.34'
+    actual: '31415926535897932384626433832795028841971693993751058.16180339887498948482045868343656381177203091798057628',
+    expected: '31415926535897932384626433832795028841971693993751058.16180339887498948482045868343656381177203091798057628'
   },{
     name: 'real/float4',
     dataTypeID: 700,
     format: 'text',
     actual: '123.456',
-    expected: '123.456'
+    expected: 123.456
   },{
     name: 'double precision / float8',
     format: 'text',
     dataTypeID: 701,
-    actual: '1.2',
-    expected: '1.2'
+    actual: '12345678.12345678',
+    expected: 12345678.12345678
   },{
     name: 'boolean true',
     format: 'text',
@@ -222,13 +222,13 @@ test('typed results', function() {
     format: 'binary',
     dataTypeID: 20,
     actual: [0, 0, 0, 0, 0, 0, 0, 102],
-    expected: 102
+    expected: '102'
   },{
     name: 'binary-bigint/int8-full',
     format: 'binary',
     dataTypeID: 20,
     actual: [1, 0, 0, 0, 0, 0, 0, 102],
-    expected: 72057594037928030
+    expected: '72057594037928038'
   },{
     name: 'binary-oid',
     format: 'binary',