diff --git a/lib/native/query.js b/lib/native/query.js
index fcb1eff4..a827af73 100644
--- a/lib/native/query.js
+++ b/lib/native/query.js
@@ -51,13 +51,29 @@ NativeQuery.prototype.promise = function() {
   return this._promise;
 };
 
+var errorFieldMap = {
+  'sqlState': 'code',
+  'statementPosition': 'position',
+  'messagePrimary': 'message',
+  'context': 'where',
+  'schemaName': 'schema',
+  'tableName': 'table',
+  'columnName': 'column',
+  'dataTypeName': 'dataType',
+  'constraintName': 'constraint',
+  'sourceFile': 'file',
+  'sourceLine': 'line',
+  'sourceFunction': 'routine',
+};
+
 NativeQuery.prototype.handleError = function(err) {
   var self = this;
   //copy pq error fields into the error object
   var fields = self.native.pq.resultErrorFields();
   if(fields) {
     for(var key in fields) {
-      err[key] = fields[key];
+      var normalizedFieldName = errorFieldMap[key] || key;
+      err[normalizedFieldName] = fields[key];
     }
   }
   if(self.callback) {
diff --git a/lib/pool-factory.js b/lib/pool-factory.js
index aa7bd0b1..85f0e6a5 100644
--- a/lib/pool-factory.js
+++ b/lib/pool-factory.js
@@ -3,7 +3,6 @@ var util = require('util');
 var Pool = require('pg-pool');
 
 module.exports = function(Client) {
-
   var BoundPool = function(options) {
     var config = { Client: Client };
     for (var key in options) {
diff --git a/test/integration/connection-pool/double-connection-tests.js b/test/integration/connection-pool/double-connection-tests.js
index ae7eb316..421e1f9e 100644
--- a/test/integration/connection-pool/double-connection-tests.js
+++ b/test/integration/connection-pool/double-connection-tests.js
@@ -1,2 +1,2 @@
-var helper = require(__dirname + "/test-helper")
+var helper = require("./test-helper")
 helper.testPoolSize(2);
diff --git a/test/integration/connection-pool/ending-empty-pool-tests.js b/test/integration/connection-pool/ending-empty-pool-tests.js
index 4f5dd80a..d1acc6f2 100644
--- a/test/integration/connection-pool/ending-empty-pool-tests.js
+++ b/test/integration/connection-pool/ending-empty-pool-tests.js
@@ -1,4 +1,4 @@
-var helper = require(__dirname + '/test-helper')
+var helper = require('./test-helper')
 
 var called = false;
 test('disconnects', function() {
diff --git a/test/integration/connection-pool/ending-pool-tests.js b/test/integration/connection-pool/ending-pool-tests.js
index 83f4b1bc..3a1ab46f 100644
--- a/test/integration/connection-pool/ending-pool-tests.js
+++ b/test/integration/connection-pool/ending-pool-tests.js
@@ -1,6 +1,7 @@
-var helper = require(__dirname + '/test-helper')
+var helper = require('./test-helper')
 
 var called = false;
+
 test('disconnects', function() {
   var sink = new helper.Sink(4, function() {
     called = true;
diff --git a/test/integration/connection-pool/error-tests.js b/test/integration/connection-pool/error-tests.js
index 2cf0501f..59121a86 100644
--- a/test/integration/connection-pool/error-tests.js
+++ b/test/integration/connection-pool/error-tests.js
@@ -1,5 +1,5 @@
-var helper = require(__dirname + "/../test-helper");
-var pg = require(__dirname + "/../../../lib");
+var helper = require("../test-helper");
+var pg = require("../../../lib");
 
 //first make pool hold 2 clients
 pg.defaults.poolSize = 2;
diff --git a/test/integration/connection-pool/max-connection-tests.js b/test/integration/connection-pool/max-connection-tests.js
index 68c0773f..944d2fb2 100644
--- a/test/integration/connection-pool/max-connection-tests.js
+++ b/test/integration/connection-pool/max-connection-tests.js
@@ -1,2 +1,2 @@
-var helper = require(__dirname + "/test-helper")
+var helper = require("./test-helper")
 helper.testPoolSize(40);
diff --git a/test/integration/connection-pool/native-instance-tests.js b/test/integration/connection-pool/native-instance-tests.js
index 06fbdb45..314920c4 100644
--- a/test/integration/connection-pool/native-instance-tests.js
+++ b/test/integration/connection-pool/native-instance-tests.js
@@ -1,4 +1,4 @@
-var helper = require(__dirname + "/../test-helper")
+var helper = require("./../test-helper")
 var pg = helper.pg
 var native = helper.args.native
 
diff --git a/test/integration/connection-pool/optional-config-tests.js b/test/integration/connection-pool/optional-config-tests.js
index f0ba2e76..be7063eb 100644
--- a/test/integration/connection-pool/optional-config-tests.js
+++ b/test/integration/connection-pool/optional-config-tests.js
@@ -1,4 +1,4 @@
-var helper = require(__dirname + '/test-helper');
+var helper = require('./test-helper');
 
 //setup defaults
 helper.pg.defaults.user = helper.args.user;
diff --git a/test/integration/connection-pool/single-connection-tests.js b/test/integration/connection-pool/single-connection-tests.js
index 5ca0a888..89f6f069 100644
--- a/test/integration/connection-pool/single-connection-tests.js
+++ b/test/integration/connection-pool/single-connection-tests.js
@@ -1,2 +1,2 @@
-var helper = require(__dirname + "/test-helper")
+var helper = require("./test-helper")
 helper.testPoolSize(1);
diff --git a/test/integration/connection-pool/single-pool-on-object-config-tests.js b/test/integration/connection-pool/single-pool-on-object-config-tests.js
index a28cbf5c..81cdf8e4 100644
--- a/test/integration/connection-pool/single-pool-on-object-config-tests.js
+++ b/test/integration/connection-pool/single-pool-on-object-config-tests.js
@@ -1,5 +1,5 @@
-var helper = require(__dirname + "/../test-helper");
-var pg = require(__dirname + "/../../../lib");
+var helper = require("../test-helper");
+var pg = require("../../../lib");
 
 pg.connect(helper.config, assert.success(function(client, done) {
     assert.equal(Object.keys(pg._pools).length, 1);
diff --git a/test/integration/connection-pool/waiting-connection-tests.js b/test/integration/connection-pool/waiting-connection-tests.js
index f2519ec5..82572d1e 100644
--- a/test/integration/connection-pool/waiting-connection-tests.js
+++ b/test/integration/connection-pool/waiting-connection-tests.js
@@ -1,2 +1,2 @@
-var helper = require(__dirname + "/test-helper")
+var helper = require("./test-helper")
 helper.testPoolSize(200);
diff --git a/test/native/native-vs-js-error-tests.js b/test/native/native-vs-js-error-tests.js
new file mode 100644
index 00000000..ee192ddc
--- /dev/null
+++ b/test/native/native-vs-js-error-tests.js
@@ -0,0 +1,20 @@
+var assert = require('assert')
+var Client = require('../../lib/client');
+var NativeClient = require('../../lib/native');
+
+var client = new Client();
+var nativeClient = new NativeClient();
+
+client.connect();
+nativeClient.connect((err) => {
+  client.query('SELECT alsdkfj', (err) => {
+    client.end();
+
+    nativeClient.query('SELECT lkdasjfasd', (nativeErr) => {
+      for(var key in nativeErr) {
+        assert.equal(err[key], nativeErr[key], `Expected err.${key} to equal nativeErr.${key}`)
+      }
+      nativeClient.end();
+    });
+  });
+});
diff --git a/test/unit/client/configuration-tests.js b/test/unit/client/configuration-tests.js
index 0204af22..5548e5fb 100644
--- a/test/unit/client/configuration-tests.js
+++ b/test/unit/client/configuration-tests.js
@@ -59,6 +59,17 @@ test('client settings', function() {
 
 test('initializing from a config string', function() {
 
+  test('uses connectionString property', function () {
+    var client = new Client({
+      connectionString: 'postgres://brian:pass@host1:333/databasename'
+    })
+    assert.equal(client.user, 'brian');
+    assert.equal(client.password, "pass");
+    assert.equal(client.host, "host1");
+    assert.equal(client.port, 333);
+    assert.equal(client.database, "databasename");
+  })
+
   test('uses the correct values from the config string', function() {
     var client = new Client("postgres://brian:pass@host1:333/databasename")
     assert.equal(client.user, 'brian');
diff --git a/test/unit/client/connection-string-tests.js b/test/unit/client/connection-string-tests.js
deleted file mode 100644
index 9316daa9..00000000
--- a/test/unit/client/connection-string-tests.js
+++ /dev/null
@@ -1,27 +0,0 @@
-require(__dirname + '/test-helper');
-
-/*
- * Perhaps duplicate of test named 'initializing from a config string' in
- * configuration-tests.js
- */
-
-test("using connection string in client constructor", function() {
-  var client = new Client("postgres://brian:pw@boom:381/lala");
-
-  test("parses user", function() {
-    assert.equal(client.user,'brian');
-  });
-  test("parses password", function() {
-    assert.equal(client.password, 'pw');
-  });
-  test("parses host", function() {
-    assert.equal(client.host, 'boom');
-  });
-  test('parses port', function() {
-    assert.equal(client.port, 381)
-  });
-  test('parses database', function() {
-    assert.equal(client.database, 'lala')
-  });
-});
-