diff --git a/test/integration/advanced.js b/test/integration/advanced.js
new file mode 100644
index 0000000..da2e7fd
--- /dev/null
+++ b/test/integration/advanced.js
@@ -0,0 +1,71 @@
+var assert = require('assert')
+
+var bigi = require('bigi')
+var bitcoin = require('../../')
+
+describe('bitcoinjs-lib (advanced)', function() {
+  it('can sign a bitcoin message', function() {
+    var key = bitcoin.ECKey.fromWIF('5KYZdUEo39z3FPrtuX2QbbwGnNP5zTd7yyr2SC1j299sBCnWjss')
+    var message = 'This is an example of a signed message.'
+
+    var signature = bitcoin.Message.sign(key, message)
+    assert.equal(signature.toString('base64'), 'G9L5yLFjti0QTHhPyFrZCT1V/MMnBtXKmoiKDZ78NDBjERki6ZTQZdSMCtkgoNmp17By9ItJr8o7ChX0XxY91nk=')
+  })
+
+  it('can verify a bitcoin message', function() {
+    var address = '1HZwkjkeaoZfTSaJxDw6aKkxp45agDiEzN'
+    var signature = 'HJLQlDWLyb1Ef8bQKEISzFbDAKctIlaqOpGbrk3YVtRsjmC61lpE5ErkPRUFtDKtx98vHFGUWlFhsh3DiW6N0rE'
+    var message = 'This is an example of a signed message.'
+
+    assert(bitcoin.Message.verify(address, signature, message))
+  })
+
+  it('can generate a single-key stealth address', function() {
+    var receiver = bitcoin.ECKey.fromWIF('5KYZdUEo39z3FPrtuX2QbbwGnNP5zTd7yyr2SC1j299sBCnWjss')
+
+    // XXX: ephemeral, must be random (and secret to sender) to preserve privacy
+    var sender = bitcoin.ECKey.fromWIF('Kxr9tQED9H44gCmp6HAdmemAzU3n84H3dGkuWTKvE23JgHMW8gct')
+
+    var G = bitcoin.ECKey.curve.G
+    var d = receiver.d // secret (receiver only)
+    var Q = receiver.pub.Q // shared
+
+    var e = sender.d // secret (sender only)
+    var P = sender.pub.Q // shared
+
+    // derived shared secret
+    var eQ = Q.multiply(e) // sender
+    var dP = P.multiply(d) // receiver
+    assert.deepEqual(eQ.getEncoded(), dP.getEncoded())
+
+    var c = bigi.fromBuffer(bitcoin.crypto.sha256(eQ.getEncoded()))
+    var cG = G.multiply(c)
+
+    // derived public key
+    var QprimeS = Q.add(cG)
+    var QprimeR = G.multiply(d.add(c))
+    assert.deepEqual(QprimeR.getEncoded(), QprimeS.getEncoded())
+
+    // derived shared-secret address
+    var address = new bitcoin.ECPubKey(QprimeS).getAddress().toString()
+
+    assert.equal(address, '1EwCNJNZM5q58YPPTnjR1H5BvYRNeyZi47')
+  })
+
+  // TODO
+  it.skip('can generate a dual-key stealth address', function() {})
+
+  it('can create an OP_RETURN transaction', function() {
+    var key = bitcoin.ECKey.fromWIF("L1uyy5qTuGrVXrmrsvHWHgVzW9kKdrp27wBC7Vs6nZDTF2BRUVwy")
+    var tx = new bitcoin.TransactionBuilder()
+
+    var data = new Buffer('cafedeadbeef', 'hex')
+    var dataScript = bitcoin.scripts.dataOutput(data)
+
+    tx.addInput("aa94ab02c182214f090e99a0d57021caffd0f195a81c24602b1028b130b63e31", 0)
+    tx.addOutput(dataScript, 1000)
+    tx.sign(0, key)
+
+    assert.equal(tx.build().toHex(), '0100000001313eb630b128102b60241ca895f1d0ffca2170d5a0990e094f2182c102ab94aa000000006a4730440220578f9df41a0e5c5052ad6eef46d005b41f966c7fda01d5f71e9c65026c9025c002202e0159ea0db47ca1bf7713e3a08bbba8cc4fdd90a2eff12591c42049c7cad6c30121029f50f51d63b345039a290c94bffd3180c99ed659ff6ea6b1242bca47eb93b59fffffffff01e803000000000000086a06cafedeadbeef00000000')
+  })
+})
diff --git a/test/integration/readme.js b/test/integration/basic.js
similarity index 51%
rename from test/integration/readme.js
rename to test/integration/basic.js
index 524ab3e..2066b55 100644
--- a/test/integration/readme.js
+++ b/test/integration/basic.js
@@ -1,10 +1,11 @@
 var assert = require('assert')
 
+var bigi = require('bigi')
 var bitcoin = require('../../')
 var crypto = require('crypto')
 var sinon = require('sinon')
 
-describe('bitcoinjs-lib (README)', function() {
+describe('bitcoinjs-lib (basic)', function() {
   it('can generate a random bitcoin address', sinon.test(function() {
     // for testing only
     this.mock(crypto).expects('randomBytes')
@@ -17,6 +18,15 @@ describe('bitcoinjs-lib (README)', function() {
     assert.equal(address, '1F5VhMHukdnUES9kfXqzPzMeF1GPHKiF64')
   }))
 
+  it('can initialize a ECKey from a sha256 hash', function() {
+    var hash = bitcoin.crypto.sha256('correct horse battery staple')
+    var d = bigi.fromBuffer(hash)
+
+    var key = new bitcoin.ECKey(d)
+
+    assert.equal(key.pub.getAddress().toString(), '1C7zdTfnkzmr13HfA2vNm5SJYRK6nEKyq8')
+  })
+
   it('can import a WIF encoded private key', function() {
     var key = bitcoin.ECKey.fromWIF('Kxr9tQED9H44gCmp6HAdmemAzU3n84H3dGkuWTKvE23JgHMW8gct')
     var address = key.pub.getAddress().toString()
@@ -34,32 +44,4 @@ describe('bitcoinjs-lib (README)', function() {
 
     assert.equal(tx.build().toHex(), '0100000001313eb630b128102b60241ca895f1d0ffca2170d5a0990e094f2182c102ab94aa000000006b483045022100aefbcf847900b01dd3e3debe054d3b6d03d715d50aea8525f5ea3396f168a1fb022013d181d05b15b90111808b22ef4f9ebe701caf2ab48db269691fdf4e9048f4f60121029f50f51d63b345039a290c94bffd3180c99ed659ff6ea6b1242bca47eb93b59fffffffff01983a0000000000001976a914ad618cf4333b3b248f9744e8e81db2964d0ae39788ac00000000')
   })
-
-  it('can create an OP_RETURN transaction', function() {
-    var key = bitcoin.ECKey.fromWIF("L1uyy5qTuGrVXrmrsvHWHgVzW9kKdrp27wBC7Vs6nZDTF2BRUVwy")
-    var tx = new bitcoin.TransactionBuilder()
-
-    var data = new Buffer('cafedeadbeef', 'hex')
-    var dataScript = bitcoin.scripts.dataOutput(data)
-
-    tx.addInput("aa94ab02c182214f090e99a0d57021caffd0f195a81c24602b1028b130b63e31", 0)
-    tx.addOutput(dataScript, 1000)
-    tx.sign(0, key)
-
-    assert.equal(tx.build().toHex(), '0100000001313eb630b128102b60241ca895f1d0ffca2170d5a0990e094f2182c102ab94aa000000006a4730440220578f9df41a0e5c5052ad6eef46d005b41f966c7fda01d5f71e9c65026c9025c002202e0159ea0db47ca1bf7713e3a08bbba8cc4fdd90a2eff12591c42049c7cad6c30121029f50f51d63b345039a290c94bffd3180c99ed659ff6ea6b1242bca47eb93b59fffffffff01e803000000000000086a06cafedeadbeef00000000')
-  })
-
-  it('can create a P2SH Multisig Address', function() {
-    var pubKeys = [
-      '026477115981fe981a6918a6297d9803c4dc04f328f22041bedff886bbc2962e01',
-      '02c96db2302d19b43d4c69368babace7854cc84eb9e061cde51cfa77ca4a22b8b9',
-      '03c6103b3b83e4a24a0e33a4df246ef11772f9992663db0c35759a5e2ebf68d8e9'
-    ].map(bitcoin.ECPubKey.fromHex)
-
-    var redeemScript = bitcoin.scripts.multisigOutput(2, pubKeys) // 2 of 3
-    var scriptPubKey = bitcoin.scripts.scriptHashOutput(redeemScript.getHash())
-    var address = bitcoin.Address.fromOutputScript(scriptPubKey).toString()
-
-    assert.equal(address, '36NUkt6FWUi3LAWBqWRdDmdTWbt91Yvfu7')
-  })
 })
diff --git a/test/integration/brainwallet.js b/test/integration/brainwallet.js
deleted file mode 100644
index 251696b..0000000
--- a/test/integration/brainwallet.js
+++ /dev/null
@@ -1,31 +0,0 @@
-var assert = require('assert')
-
-var bigi = require('bigi')
-var bitcoin = require('../../')
-
-describe('bitcoinjs-lib (brainwallet examples)', function() {
-  it('can initialize a ECKey from a sha256 hash', function() {
-    var hash = bitcoin.crypto.sha256('correct horse battery staple')
-    var d = bigi.fromBuffer(hash)
-
-    var key = new bitcoin.ECKey(d)
-
-    assert.equal(key.pub.getAddress().toString(), '1C7zdTfnkzmr13HfA2vNm5SJYRK6nEKyq8')
-  })
-
-  it('can sign a bitcoin message', function() {
-    var key = bitcoin.ECKey.fromWIF('5KYZdUEo39z3FPrtuX2QbbwGnNP5zTd7yyr2SC1j299sBCnWjss')
-    var message = 'This is an example of a signed message.'
-
-    var signature = bitcoin.Message.sign(key, message)
-    assert.equal(signature.toString('base64'), 'G9L5yLFjti0QTHhPyFrZCT1V/MMnBtXKmoiKDZ78NDBjERki6ZTQZdSMCtkgoNmp17By9ItJr8o7ChX0XxY91nk=')
-  })
-
-  it('can verify a bitcoin message', function() {
-    var address = '1HZwkjkeaoZfTSaJxDw6aKkxp45agDiEzN'
-    var signature = 'HJLQlDWLyb1Ef8bQKEISzFbDAKctIlaqOpGbrk3YVtRsjmC61lpE5ErkPRUFtDKtx98vHFGUWlFhsh3DiW6N0rE'
-    var message = 'This is an example of a signed message.'
-
-    assert(bitcoin.Message.verify(address, signature, message))
-  })
-})
diff --git a/test/integration/darkwallet.js b/test/integration/darkwallet.js
deleted file mode 100644
index e07b9aa..0000000
--- a/test/integration/darkwallet.js
+++ /dev/null
@@ -1,39 +0,0 @@
-var assert = require('assert')
-
-var bigi = require('bigi')
-var bitcoin = require('../../')
-
-describe('bitcoinjs-lib (darkwallet examples)', function() {
-  it('can generate a single-key stealth address', function() {
-    var receiver = bitcoin.ECKey.fromWIF('5KYZdUEo39z3FPrtuX2QbbwGnNP5zTd7yyr2SC1j299sBCnWjss')
-    var sender = bitcoin.ECKey.fromWIF('Kxr9tQED9H44gCmp6HAdmemAzU3n84H3dGkuWTKvE23JgHMW8gct') // XXX: ephemeral, must be random to preserve privacy
-
-    var G = bitcoin.ECKey.curve.G
-    var d = receiver.d // secret (receiver only)
-    var Q = receiver.pub.Q // shared
-
-    var e = sender.d // secret (sender only)
-    var P = sender.pub.Q // shared
-
-    // derived shared secret
-    var eQ = Q.multiply(e) // sender
-    var dP = P.multiply(d) // receiver
-    assert.deepEqual(eQ.getEncoded(), dP.getEncoded())
-
-    var c = bigi.fromBuffer(bitcoin.crypto.sha256(eQ.getEncoded()))
-    var cG = G.multiply(c)
-
-    // derived public key
-    var QprimeS = Q.add(cG)
-    var QprimeR = G.multiply(d.add(c))
-    assert.deepEqual(QprimeR.getEncoded(), QprimeS.getEncoded())
-
-    // derived shared-secret address
-    var address = new bitcoin.ECPubKey(QprimeS).getAddress().toString()
-
-    assert.equal(address, '1EwCNJNZM5q58YPPTnjR1H5BvYRNeyZi47')
-  })
-
-  // TODO
-  it.skip('can generate a dual-key stealth address', function() {})
-})
diff --git a/test/integration/helloblock.js b/test/integration/helloblock.js
deleted file mode 100644
index 7cd04dd..0000000
--- a/test/integration/helloblock.js
+++ /dev/null
@@ -1,68 +0,0 @@
-var assert = require('assert')
-
-var bitcoin = require('../../')
-var networks = bitcoin.networks
-var scripts = bitcoin.scripts
-
-var Address = bitcoin.Address
-var ECKey = bitcoin.ECKey
-var TransactionBuilder = bitcoin.TransactionBuilder
-
-var helloblock = require('helloblock-js')({
-  network: 'testnet'
-})
-
-describe('bitcoinjs-lib (helloblock)', function() {
-  this.timeout(20000)
-
-  it('can spend from a 2-of-2 address', function(done) {
-    var privKeys = [
-      '91avARGdfge8E4tZfYLoxeJ5sGBdNJQH4kvjJoQFacbgwmaKkrx',
-      '91avARGdfge8E4tZfYLoxeJ5sGBdNJQH4kvjJoQFacbgww7vXtT'
-    ].map(ECKey.fromWIF)
-    var pubKeys = privKeys.map(function(x) { return x.pub })
-
-    var redeemScript = scripts.multisigOutput(2, pubKeys)
-    var scriptPubKey = scripts.scriptHashOutput(redeemScript.getHash())
-    var p2shAddress = Address.fromOutputScript(scriptPubKey, networks.testnet).toString()
-
-    // Attempt to send funds to the source address
-    helloblock.faucet.withdraw(p2shAddress, 2e4, function(err) {
-      if (err) return done(err)
-
-      // get latest unspents from the p2shAddress
-      helloblock.addresses.getUnspents(p2shAddress, function(err, res, unspents) {
-        if (err) return done(err)
-
-        // use the oldest unspent
-        var unspent = unspents[unspents.length - 1]
-        var spendAmount = Math.min(unspent.value, 1e4)
-
-        // make a random destination address
-        var targetAddress = ECKey.makeRandom().pub.getAddress(networks.testnet).toString()
-
-        var txb = new TransactionBuilder()
-        txb.addInput(unspent.txHash, unspent.index)
-        txb.addOutput(targetAddress, spendAmount)
-
-        privKeys.forEach(function(privKey) {
-          txb.sign(0, privKey, redeemScript)
-        })
-
-        // broadcast our transaction
-        helloblock.transactions.propagate(txb.build().toHex(), function(err) {
-          // no err means that the transaction has been successfully propagated
-          if (err) return done(err)
-
-          // check that the funds (spendAmount Satoshis) indeed arrived at the intended address
-          helloblock.addresses.get(targetAddress, function(err, res, addrInfo) {
-            if (err) return done(err)
-
-            assert.equal(addrInfo.balance, spendAmount)
-            done()
-          })
-        })
-      })
-    })
-  })
-})
diff --git a/test/integration/multisig.js b/test/integration/multisig.js
new file mode 100644
index 0000000..05bec9e
--- /dev/null
+++ b/test/integration/multisig.js
@@ -0,0 +1,76 @@
+var assert = require('assert')
+
+var bitcoin = require('../../')
+
+var helloblock = require('helloblock-js')({
+  network: 'testnet'
+})
+
+describe('bitcoinjs-lib (multisig)', function() {
+  it('can create a 2-of-3 multisig P2SH address', function() {
+    var pubKeys = [
+      '026477115981fe981a6918a6297d9803c4dc04f328f22041bedff886bbc2962e01',
+      '02c96db2302d19b43d4c69368babace7854cc84eb9e061cde51cfa77ca4a22b8b9',
+      '03c6103b3b83e4a24a0e33a4df246ef11772f9992663db0c35759a5e2ebf68d8e9'
+    ].map(bitcoin.ECPubKey.fromHex)
+
+    var redeemScript = bitcoin.scripts.multisigOutput(2, pubKeys) // 2 of 3
+    var scriptPubKey = bitcoin.scripts.scriptHashOutput(redeemScript.getHash())
+    var address = bitcoin.Address.fromOutputScript(scriptPubKey).toString()
+
+    assert.equal(address, '36NUkt6FWUi3LAWBqWRdDmdTWbt91Yvfu7')
+  })
+
+  it('can spend from a 2-of-2 multsig P2SH address', function(done) {
+    var privKeys = [
+      '91avARGdfge8E4tZfYLoxeJ5sGBdNJQH4kvjJoQFacbgwmaKkrx',
+      '91avARGdfge8E4tZfYLoxeJ5sGBdNJQH4kvjJoQFacbgww7vXtT'
+    ].map(bitcoin.ECKey.fromWIF)
+    var pubKeys = privKeys.map(function(x) { return x.pub })
+
+    var redeemScript = bitcoin.scripts.multisigOutput(2, pubKeys) // 2 of 2
+    var scriptPubKey = bitcoin.scripts.scriptHashOutput(redeemScript.getHash())
+    var address = bitcoin.Address.fromOutputScript(scriptPubKey).toString()
+
+    // Attempt to send funds to the source address
+    helloblock.faucet.withdraw(address, 2e4, function(err) {
+      if (err) return done(err)
+
+      // get latest unspents from the address
+      helloblock.addresses.getUnspents(address, function(err, res, unspents) {
+        if (err) return done(err)
+
+        // filter small unspents
+        unspents = unspents.filter(function(unspent) { return unspent.value > 1e4 })
+
+        // use the oldest unspent
+        var unspent = unspents.pop()
+
+        // make a random destination address
+        var targetAddress = bitcoin.ECKey.makeRandom().pub.getAddress(bitcoin.networks.testnet).toString()
+
+        var txb = new bitcoin.TransactionBuilder()
+        txb.addInput(unspent.txHash, unspent.index)
+        txb.addOutput(targetAddress, 1e4)
+
+        // sign w/ each private key
+        privKeys.forEach(function(privKey) {
+          txb.sign(0, privKey, redeemScript)
+        })
+
+        // broadcast our transaction
+        helloblock.transactions.propagate(txb.build().toHex(), function(err) {
+          if (err) return done(err)
+
+          // check that the funds (1e4 Satoshis) indeed arrived at the intended address
+          helloblock.addresses.get(targetAddress, function(err, res, addrInfo) {
+            if (err) return done(err)
+
+            assert.equal(addrInfo.balance, 1e4)
+            done()
+          })
+        })
+      })
+    })
+  })
+})