diff --git a/lib/script/script.js b/lib/script/script.js
index 02f25b5..3f8f769 100644
--- a/lib/script/script.js
+++ b/lib/script/script.js
@@ -778,13 +778,6 @@ Script.prototype.toAddress = function(network) {
   return new Address(info);
 };
 
-/**
- * @return {Script}
- */
-Script.prototype.toScriptHashOut = function() {
-  return Script.buildScriptHashOut(this);
-};
-
 /**
  * Analagous to bitcoind's FindAndDelete. Find and delete equivalent chunks,
  * typically used with push data chunks.  Note that this will find and delete
diff --git a/test/encoding/bufferreader.js b/test/encoding/bufferreader.js
index 97b0e8b..e3b66c1 100644
--- a/test/encoding/bufferreader.js
+++ b/test/encoding/bufferreader.js
@@ -21,6 +21,12 @@ describe('BufferReader', function() {
     should.exist(br);
     Buffer.isBuffer(br.buf).should.equal(true);
   });
+    it('should fail for invalid object', function() {
+      var fail = function() {
+        return new BufferReader(5);
+      };
+      fail.should.throw('Unrecognized argument for BufferReader');
+    });
 
   describe('#set', function() {
 
diff --git a/test/script/script.js b/test/script/script.js
index 19c1bef..0a0cb6d 100644
--- a/test/script/script.js
+++ b/test/script/script.js
@@ -326,11 +326,16 @@ describe('Script', function() {
 
   describe('#isScripthashOut', function() {
 
-    it('should identify this known pubkeyhashout as pubkeyhashout', function() {
+    it('should identify this known p2shout as p2shout', function() {
       Script('OP_HASH160 20 0x0000000000000000000000000000000000000000 OP_EQUAL').isScriptHashOut().should.equal(true);
     });
 
-    it('should identify these known non-pubkeyhashout as not pubkeyhashout', function() {
+    it('should identify result of .isScriptHashOut() as p2sh', function() {
+      Script('OP_DUP OP_HASH160 20 0x0000000000000000000000000000000000000000 OP_EQUALVERIFY OP_CHECKSIG')
+      .toScriptHashOut().isScriptHashOut().should.equal(true);
+    });
+
+    it('should identify these known non-p2shout as not p2shout', function() {
       Script('OP_HASH160 20 0x0000000000000000000000000000000000000000 OP_EQUAL OP_EQUAL').isScriptHashOut().should.equal(false);
       Script('OP_HASH160 21 0x000000000000000000000000000000000000000000 OP_EQUAL').isScriptHashOut().should.equal(false);
     });