diff --git a/.gitignore b/.gitignore
index 43220117..acf05f4c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,7 @@ Release/*.*
 
 # Ignore locally installed node_modules
 node_modules
+!test/node_modules
 
 # Ignore tmp directory.
 tmp
diff --git a/src/js/ripple/index.js b/src/js/ripple/index.js
index b1c40dee..731be601 100644
--- a/src/js/ripple/index.js
+++ b/src/js/ripple/index.js
@@ -5,6 +5,7 @@ exports.Account          = require('./account').Account;
 exports.Transaction      = require('./transaction').Transaction;
 exports.Currency         = require('./currency').Currency;
 exports.Base             = require('./base').Base;
+exports.UInt128          = require('./uint128').UInt128;
 exports.UInt160          = require('./uint160').UInt160;
 exports.UInt256          = require('./uint256').UInt256;
 exports.Seed             = require('./seed').Seed;
@@ -19,6 +20,10 @@ exports.binformat        = require('./binformat');
 exports.utils            = require('./utils');
 exports.Server           = require('./server').Server;
 exports.Wallet           = require('./wallet');
+exports.Ledger           = require('./ledger').Ledger;
+exports.TransactionQueue = require('./transactionqueue').TransactionQueue;
+exports.VaultClient      = require('./vaultclient').VaultClient;
+exports.Blob             = require('./blob').Blob;
 
 // Important: We do not guarantee any specific version of SJCL or for any
 // specific features to be included. The version and configuration may change at
@@ -28,6 +33,8 @@ exports.Wallet           = require('./wallet');
 // the official client, it makes sense to expose the SJCL instance so we don't
 // have to include it twice.
 exports.sjcl   = require('./utils').sjcl;
+exports.jsbn   = require('./utils').jsbn;
+exports.types  = require('./serializedtypes');
 
 exports.config = require('./config');
 
diff --git a/test/account-test.js b/test/account-test.js
index 1a7744a1..9494e7ad 100644
--- a/test/account-test.js
+++ b/test/account-test.js
@@ -1,5 +1,5 @@
 var assert = require('assert');
-var Account = require('../src/js/ripple/account').Account;
+var Account = require('ripple-lib').Account;
 
 describe('Account', function(){
 
diff --git a/test/amount-test.js b/test/amount-test.js
index 3cdbf50b..f0e7585f 100644
--- a/test/amount-test.js
+++ b/test/amount-test.js
@@ -1,9 +1,12 @@
-var assert     = require('assert');
-var utils      = require('./testutils');
-var BigInteger = require('../src/js/jsbn/jsbn').BigInteger;
-var Amount     = utils.load_module('amount').Amount;
-var UInt160    = utils.load_module('uint160').UInt160;
-var config     = utils.get_config();
+var assert      = require('assert');
+var BigInteger  = require('ripple-lib').jsbn.BigInteger;
+var Amount      = require('ripple-lib').Amount;
+var UInt160     = require('ripple-lib').UInt160;
+var load_config = require('ripple-lib').config.load;
+var config      = require('./config-example');
+
+load_config(config);
+
 
 describe('Amount', function() {
   describe('Negatives', function() {
diff --git a/test/base58-test.js b/test/base58-test.js
index 4383df4c..856e5619 100644
--- a/test/base58-test.js
+++ b/test/base58-test.js
@@ -1,7 +1,5 @@
 var assert = require('assert');
-var utils  = require('./testutils');
-var Seed   = utils.load_module('seed').Seed;
-var config = require('./testutils').get_config();
+var Seed   = require('ripple-lib').Seed;
 
 describe('Base58', function() {
   describe('Seed', function() {
diff --git a/test/currency-test.js b/test/currency-test.js
index e95b0285..7bf3ac68 100644
--- a/test/currency-test.js
+++ b/test/currency-test.js
@@ -1,7 +1,6 @@
 var assert   = require('assert');
-var utils    = require('./testutils');
-var currency = utils.load_module('currency').Currency;
-var timeUtil = utils.load_module('utils').time;
+var currency = require('ripple-lib').Currency;
+var timeUtil = require('ripple-lib').utils.time;
 
 describe('Currency', function() {
   describe('json_rewrite', function() {
diff --git a/test/keypair-test.js b/test/keypair-test.js
index 89433ea8..b00be5fb 100644
--- a/test/keypair-test.js
+++ b/test/keypair-test.js
@@ -1,7 +1,5 @@
 var assert = require('assert');
-var utils  = require('./testutils');
-var Seed   = utils.load_module('seed').Seed;
-var config = require('./testutils').get_config();
+var Seed   = require('ripple-lib').Seed;
 
 describe('KeyPair', function() {
   it('can generate an address', function () {
diff --git a/test/ledger-test.js b/test/ledger-test.js
index 23206fba..1742fb6f 100644
--- a/test/ledger-test.js
+++ b/test/ledger-test.js
@@ -1,9 +1,7 @@
 var assert = require('assert');
 var fs     = require('fs');
 
-var utils  = require('./testutils');
-var Ledger = utils.load_module('ledger').Ledger;
-var config = require('./testutils').get_config();
+var Ledger = require('ripple-lib').Ledger;
 
 /**
 * @param ledger_index {Number}
diff --git a/test/message-test.js b/test/message-test.js
index 13fbdbec..b2a3e729 100644
--- a/test/message-test.js
+++ b/test/message-test.js
@@ -1,8 +1,8 @@
 var assert  = require('assert');
-var sjcl    = require('../build/sjcl');
-var Message = require('../src/js/ripple/message').Message;
-var Seed    = require('../src/js/ripple/seed').Seed;
-var Remote  = require('../src/js/ripple/remote').Remote;
+var sjcl    = require('ripple-lib').sjcl;
+var Message = require('ripple-lib').Message;
+var Seed    = require('ripple-lib').Seed;
+var Remote  = require('ripple-lib').Remote;
 
 describe('Message', function(){
 
diff --git a/test/node_modules/ripple-lib b/test/node_modules/ripple-lib
new file mode 120000
index 00000000..3db6ddeb
--- /dev/null
+++ b/test/node_modules/ripple-lib
@@ -0,0 +1 @@
+../../src/js/ripple/
\ No newline at end of file
diff --git a/test/orderbook-test.js b/test/orderbook-test.js
index 77edec05..103bc355 100644
--- a/test/orderbook-test.js
+++ b/test/orderbook-test.js
@@ -1,9 +1,8 @@
 var assert = require('assert');
-var utils = require('./testutils');
-var Remote  = utils.load_module('remote').Remote;
-var Currency = utils.load_module('currency').Currency;
-var Amount = utils.load_module('amount').Amount;
-var Meta = utils.load_module('meta').Meta;
+var Remote  = require('ripple-lib').Remote;
+var Currency = require('ripple-lib').Currency;
+var Amount = require('ripple-lib').Amount;
+var Meta = require('ripple-lib').Meta;
 
 describe('OrderBook', function() {
   it('toJSON', function() {
diff --git a/test/remote-test.js b/test/remote-test.js
index 39d9a007..b1da20bf 100644
--- a/test/remote-test.js
+++ b/test/remote-test.js
@@ -1,9 +1,7 @@
 var assert = require('assert');
-var utils  = require('./testutils');
-
-var Remote = utils.load_module('remote').Remote;
-var Server = utils.load_module('server').Server;
-var Request = utils.load_module('request').Request;
+var Remote = require('ripple-lib').Remote;
+var Server = require('ripple-lib').Server;
+var Request = require('ripple-lib').Request;
 
 var options, remote, callback, database, tx;
 
diff --git a/test/request-test.js b/test/request-test.js
index dd395f7e..a62f398a 100644
--- a/test/request-test.js
+++ b/test/request-test.js
@@ -1,9 +1,8 @@
 var assert = require('assert');
-var utils = require('./testutils');
-var Request = utils.load_module('request').Request;
-var Remote = utils.load_module('remote').Remote;
-var Server = utils.load_module('server').Server;
-var Currency = utils.load_module('currency').Currency;
+var Request = require('ripple-lib').Request;
+var Remote = require('ripple-lib').Remote;
+var Server = require('ripple-lib').Server;
+var Currency = require('ripple-lib').Currency;
 
 function makeServer(url) {
   var server = new Server(new process.EventEmitter(), url);
diff --git a/test/seed-test.js b/test/seed-test.js
index 551a1447..7a9d5aa6 100644
--- a/test/seed-test.js
+++ b/test/seed-test.js
@@ -1,7 +1,5 @@
 var assert = require('assert');
-var utils  = require('./testutils');
-var Seed   = utils.load_module('seed').Seed;
-var config = require('./testutils').get_config();
+var Seed   = require('ripple-lib').Seed;
 
 describe('Seed', function() {
   it('can generate many addresses', function () {
diff --git a/test/serializedobject-test.js b/test/serializedobject-test.js
index 4ac809c3..dc9a36c2 100644
--- a/test/serializedobject-test.js
+++ b/test/serializedobject-test.js
@@ -1,7 +1,6 @@
-var utils            = require('./testutils');
 var assert           = require('assert');
-var SerializedObject = utils.load_module('serializedobject').SerializedObject;
-var sjcl             = require('./../src/js/ripple/utils').sjcl;
+var SerializedObject = require('ripple-lib').SerializedObject;
+var sjcl             = require('ripple-lib').sjcl;
 
 // Shortcuts
 var hex = sjcl.codec.hex;
@@ -325,4 +324,4 @@ describe('Serialized object', function() {
 
 });
 
-// vim:sw=2:sts=2:ts=8:et
\ No newline at end of file
+// vim:sw=2:sts=2:ts=8:et
diff --git a/test/serializedtypes-test.js b/test/serializedtypes-test.js
index a78fc495..25072530 100644
--- a/test/serializedtypes-test.js
+++ b/test/serializedtypes-test.js
@@ -1,11 +1,8 @@
-var utils            = require('./testutils');
 var assert           = require('assert');
-var SerializedObject = utils.load_module('serializedobject').SerializedObject;
-var types            = utils.load_module('serializedtypes');
-var amountConstants  = require('../src/js/ripple/amount').consts;
-var BigInteger       = require('../src/js/jsbn/jsbn').BigInteger;
-
-var config = require('./testutils').get_config();
+var SerializedObject = require('ripple-lib').SerializedObject;
+var types            = require('ripple-lib').types;
+var Amount           = require('ripple-lib').Amount;
+var BigInteger       = require('ripple-lib').jsbn.BigInteger;
 
 describe('Serialized types', function() {
   describe('Int8', function() {
@@ -553,7 +550,7 @@ describe('Serialized types', function() {
     });
     it('Serialize max_value/USD/rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh', function () {
       var so = new SerializedObject();
-      types.Amount.serialize(so, amountConstants.max_value+'/USD/rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh');
+      types.Amount.serialize(so, Amount.max_value+'/USD/rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh');
       assert.strictEqual(so.to_hex(), 'EC6386F26FC0FFFF0000000000000000000000005553440000000000B5F762798A53D543A014CAF8B297CFF8F2F937E8');
     });
     it('Parse 1 XRP', function () {
@@ -590,7 +587,7 @@ describe('Serialized types', function() {
     });
     it('Parse max_value/USD/rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh', function () {
       var so = new SerializedObject('EC6386F26FC0FFFF0000000000000000000000005553440000000000B5F762798A53D543A014CAF8B297CFF8F2F937E8');
-      assert.strictEqual(types.Amount.parse(so).to_text_full(), amountConstants.max_value+'/USD/rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh');
+      assert.strictEqual(types.Amount.parse(so).to_text_full(), Amount.max_value+'/USD/rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh');
     });
   });
 
diff --git a/test/server-test.js b/test/server-test.js
index bd825b9c..c63a4f55 100644
--- a/test/server-test.js
+++ b/test/server-test.js
@@ -1,10 +1,9 @@
 var assert = require('assert');
 var ws = require('ws');
-var utils = require('./testutils');
-var Remote  = utils.load_module('remote').Remote;
-var Server = utils.load_module('server').Server;
-var Request = utils.load_module('request').Request;
-var Transaction = utils.load_module('transaction').Transaction;
+var Remote  = require('ripple-lib').Remote;
+var Server = require('ripple-lib').Server;
+var Request = require('ripple-lib').Request;
+var Transaction = require('ripple-lib').Transaction;
 
 describe('Server', function() {
   it('Server constructor - invalid options', function() {
diff --git a/test/sign-test.js b/test/sign-test.js
index bf732b67..3bfa2e42 100644
--- a/test/sign-test.js
+++ b/test/sign-test.js
@@ -1,6 +1,5 @@
 var assert = require('assert');
-var utils  = require('./testutils');
-var Seed   = utils.load_module('seed').Seed;
+var Seed   = require('ripple-lib').Seed;
 
 function _isNaN(n) {
   return typeof n === 'number' && isNaN(n);
diff --git a/test/sjcl-ecdsa-canonical-test.js b/test/sjcl-ecdsa-canonical-test.js
index d0a270b7..92d0fab2 100644
--- a/test/sjcl-ecdsa-canonical-test.js
+++ b/test/sjcl-ecdsa-canonical-test.js
@@ -1,7 +1,6 @@
 var assert = require('assert');
-var utils  = require('./testutils');
-var sjcl   = require('../build/sjcl');
-var Seed   = require('../src/js/ripple/seed').Seed;
+var sjcl   = require('ripple-lib').sjcl;
+var Seed   = require('ripple-lib').Seed;
 
 describe('SJCL ECDSA Canonicalization', function() {
   describe('canonicalizeSignature', function() {
diff --git a/test/sjcl-ecdsa-recoverablepublickey-test.js b/test/sjcl-ecdsa-recoverablepublickey-test.js
index a94dc972..fa53c5dd 100644
--- a/test/sjcl-ecdsa-recoverablepublickey-test.js
+++ b/test/sjcl-ecdsa-recoverablepublickey-test.js
@@ -1,6 +1,5 @@
 var assert            = require('assert');
-var utils             = require('./testutils');
-var sjcl              = require('../build/sjcl');
+var sjcl              = require('ripple-lib').sjcl;
 
 describe('ECDSA signing with recoverable public key', function(){
 
diff --git a/test/sjcl-extramath-test.js b/test/sjcl-extramath-test.js
index aa05c03f..60090bc0 100644
--- a/test/sjcl-extramath-test.js
+++ b/test/sjcl-extramath-test.js
@@ -1,6 +1,5 @@
 var assert = require('assert');
-var utils  = require('./testutils');
-var sjcl   = require('../build/sjcl');
+var sjcl   = require('ripple-lib').sjcl;
 
 describe('SJCL Extramath', function() {
   describe('setBitM', function() {
diff --git a/test/sjcl-jacobi-test.js b/test/sjcl-jacobi-test.js
index 3fcc2731..78d15f99 100644
--- a/test/sjcl-jacobi-test.js
+++ b/test/sjcl-jacobi-test.js
@@ -1,6 +1,5 @@
 var assert = require('assert');
-var utils  = require('./testutils');
-var sjcl   = require('../build/sjcl');
+var sjcl   = require('ripple-lib').sjcl;
 
 describe('SJCL Jacobi', function() {
   it('(15/13) = -1', function () {
diff --git a/test/sjcl-montgomery.js b/test/sjcl-montgomery.js
index d6abe478..cbd1f690 100644
--- a/test/sjcl-montgomery.js
+++ b/test/sjcl-montgomery.js
@@ -1,6 +1,5 @@
 var assert = require('assert');
-var utils  = require('./testutils');
-var sjcl   = require('../build/sjcl');
+var sjcl   = require('ripple-lib').sjcl;
 
 function testExp(vec) {
   var actual = new sjcl.bn(vec.g).powermodMontgomery(new sjcl.bn(vec.e),
diff --git a/test/testutils.js b/test/testutils.js
deleted file mode 100644
index 411ffb37..00000000
--- a/test/testutils.js
+++ /dev/null
@@ -1,31 +0,0 @@
-var ripple = require('../src/js/ripple');
-
-exports.get_config = get_config;
-
-function get_config() {
-  var config = { };
-  try {
-    config = require('./config');
-  } catch(exception) {
-    config = require('./config-example');
-  }
-  return load_config(config);
-};
-
-exports.load_config = load_config;
-
-function load_config(config) {
-  return load_module('config').load(config);
-};
-
-exports.load_module = load_module;
-
-function load_module(name) {
-  if (process.env.RIPPLE_LIB_COV) {
-    return require('../src-cov/js/ripple/' + name)
-  } else if (!ripple.hasOwnProperty(name)) {
-    return require('../src/js/ripple/' + name);
-  } else {
-    return require('../src/js/ripple')[name];
-  }
-};
diff --git a/test/transaction-queue-test.js b/test/transaction-queue-test.js
index 8288ea18..0d38484d 100644
--- a/test/transaction-queue-test.js
+++ b/test/transaction-queue-test.js
@@ -1,7 +1,6 @@
 var assert = require('assert');
-var utils = require('./testutils');
-var Transaction = utils.load_module('transaction').Transaction;
-var TransactionQueue = utils.load_module('transactionqueue').TransactionQueue;
+var Transaction = require('ripple-lib').Transaction;
+var TransactionQueue = require('ripple-lib').TransactionQueue;
 
 describe('Transaction queue', function() {
   it('Push transaction', function() {
diff --git a/test/transaction-test.js b/test/transaction-test.js
index 67eeeab0..3511faa5 100644
--- a/test/transaction-test.js
+++ b/test/transaction-test.js
@@ -1,10 +1,9 @@
-var utils            = require('./testutils');
 var assert           = require('assert');
-var Amount           = utils.load_module('amount').Amount;
-var Transaction      = utils.load_module('transaction').Transaction;
-var TransactionQueue = utils.load_module('transactionqueue').TransactionQueue;
-var Remote           = utils.load_module('remote').Remote;
-var Server           = utils.load_module('server').Server;
+var Amount           = require('ripple-lib').Amount;
+var Transaction      = require('ripple-lib').Transaction;
+var TransactionQueue = require('ripple-lib').TransactionQueue;
+var Remote           = require('ripple-lib').Remote;
+var Server           = require('ripple-lib').Server;
 
 var transactionResult = {
   engine_result: 'tesSUCCESS',
diff --git a/test/uint-test.js b/test/uint-test.js
index 9075f51e..d1e1ec3f 100644
--- a/test/uint-test.js
+++ b/test/uint-test.js
@@ -1,7 +1,5 @@
 var assert  = require('assert');
-var utils   = require('./testutils');
-var UInt128 = utils.load_module('uint128').UInt128;
-var config  = require('./testutils').get_config();
+var UInt128 = require('ripple-lib').UInt128;
 
 describe('UInt', function() {
   describe('128', function() {
diff --git a/test/utils-test.js b/test/utils-test.js
index 690b9664..3e811399 100644
--- a/test/utils-test.js
+++ b/test/utils-test.js
@@ -1,6 +1,5 @@
-var fs     = require('fs');
 var assert = require('assert');
-var utils  = require('./testutils').load_module('utils');
+var utils  = require('ripple-lib').utils;
 
 describe('Utils', function() {
   describe('hexToString and stringToHex', function() {
diff --git a/test/vault-test.js b/test/vault-test.js
index 01fe916d..1fb892c8 100644
--- a/test/vault-test.js
+++ b/test/vault-test.js
@@ -1,11 +1,11 @@
 var assert      = require('assert');
-var RippleTxt   = require('../src/js/ripple/rippletxt').RippleTxt;
-var AuthInfo    = require('../src/js/ripple/authinfo').AuthInfo;
-var VaultClient = require('../src/js/ripple/vaultclient').VaultClient;
-var Blob        = require('../src/js/ripple/blob').Blob;
-var UInt256     = require('../src/js/ripple/uint256').UInt256;
-var sjcl        = require('../build/sjcl');
 var nock        = require('nock');
+var RippleTxt   = require('ripple-lib').RippleTxt;
+var AuthInfo    = require('ripple-lib').AuthInfo;
+var VaultClient = require('ripple-lib').VaultClient;
+var Blob        = require('ripple-lib').Blob;
+var UInt256     = require('ripple-lib').UInt256;
+var sjcl        = require('ripple-lib').sjcl;
 var online      = process.argv.indexOf('--online-blobvault') !== -1 ? true : false; 
 
 var exampleData = {