diff --git a/src/base58check.js b/src/base58check.js
index 2e91a43..8108a0b 100644
--- a/src/base58check.js
+++ b/src/base58check.js
@@ -3,13 +3,13 @@ var bs58check = require('bs58check')
 function decode() {
   console.warn('bs58check will be removed in 2.0.0. require("bs58check") instead.');
 
-  bs58check.decode.apply(undefined, arguments)
+  return bs58check.decode.apply(undefined, arguments)
 }
 
 function encode() {
   console.warn('bs58check will be removed in 2.0.0. require("bs58check") instead.');
 
-  bs58check.encode.apply(undefined, arguments)
+  return bs58check.encode.apply(undefined, arguments)
 }
 
 module.exports = {
diff --git a/test/base58check.js b/test/base58check.js
index 09e9378..8b70404 100644
--- a/test/base58check.js
+++ b/test/base58check.js
@@ -1,3 +1,4 @@
+var assert = require('assert')
 var base58check = require('../src/base58check')
 var bs58check = require('bs58check')
 var sinon = require('sinon')
@@ -11,15 +12,15 @@ describe('base58check', function() {
 
   it('wraps bs58check.decode', sinon.test(function() {
     this.mock(bs58check).expects('decode')
-      .once().calledWith(param)
+      .once().calledWith(param).returns('foo')
 
-    base58check.decode(param)
+    assert.equal(base58check.decode(param), 'foo')
   }))
 
   it('wraps bs58check.encode', sinon.test(function() {
     this.mock(bs58check).expects('encode')
-      .once().calledWith(param)
+      .once().calledWith(param).returns('foo')
 
-    base58check.encode(param)
+    assert.equal(base58check.encode(param), 'foo')
   }))
 })
diff --git a/test/bitcoin.core.js b/test/bitcoin.core.js
index 3560c81..2dc76fc 100644
--- a/test/bitcoin.core.js
+++ b/test/bitcoin.core.js
@@ -1,14 +1,16 @@
 var assert = require('assert')
-var base58 = require('bs58')
-var base58check = require('bs58check')
 var networks = require('../src/networks')
 
-var Address = require('../src/address')
-var BigInteger = require('bigi')
-var ECKey = require('../src/eckey')
-var ECSignature = require('../src/ecsignature')
-var Transaction = require('../src/transaction')
-var Script = require('../src/script')
+var base58 = require('bs58')
+//var base58check = require('bs58check')
+
+var Bitcoin = require('../')
+var Address = Bitcoin.Address
+var base58check = Bitcoin.base58check
+var ECKey = Bitcoin.ECKey
+var ECSignature = Bitcoin.ECSignature
+var Transaction = Bitcoin.Transaction
+var Script = Bitcoin.Script
 
 var base58_encode_decode = require("./fixtures/core/base58_encode_decode.json")
 var base58_keys_invalid = require("./fixtures/core/base58_keys_invalid.json")
@@ -120,8 +122,8 @@ describe('Bitcoin-core', function() {
 
       it('throws on ' + string, function() {
         assert.throws(function() {
-          var privKey = ECKey.fromWIF(string)
-          var version = base58check.decode(string).version
+          ECKey.fromWIF(string)
+          var version = base58check.decode(string).readUInt8(0)
 
           assert.notEqual(allowedNetworks.indexOf(version), -1, 'Invalid network')
         }, /Invalid (checksum|compression flag|network|WIF payload)/)