diff --git a/test/script.js b/test/script.js
index f8e378e..73cf257 100644
--- a/test/script.js
+++ b/test/script.js
@@ -7,7 +7,7 @@ var sha256ripe160 = Util.sha256ripe160;
 
 var Convert = require('../src/convert.js')
 var bytesToHex = Convert.bytesToHex;
-var hexToBytes = Convert.hexToBytes; 
+var hexToBytes = Convert.hexToBytes;
 
 describe('Script', function() {
   describe('constructor', function() {
@@ -23,7 +23,7 @@ describe('Script', function() {
       assert.throws(function(){ new Script({}) })
     })
   })
-  
+
   describe('2-of-3 Multi-Signature', function() {
     var compressedPubKeys = []
     var numSigs
@@ -32,7 +32,7 @@ describe('Script', function() {
       compressedPubKeys = ['02ea1297665dd733d444f31ec2581020004892cdaaf3dd6c0107c615afb839785f',
                            '02fab2dea1458990793f56f42e4a47dbf35a12a351f26fa5d7e0cc7447eaafa21f',
                            '036c6802ce7e8113723dd92cdb852e492ebb157a871ca532c3cb9ed08248ff0e19']
-                           
+
       numSigs = 2;
     })
 
@@ -42,13 +42,36 @@ describe('Script', function() {
       var multisig = sha256ripe160(script.buffer)
       var multiSigAddress = Address(multisig,network).toString()
       var redeemScript = bytesToHex(script.buffer)
-     
+
       assert.ok(Address.validate(multiSigAddress))
       assert.equal(Address.getVersion(multiSigAddress),'0x05')
       assert.equal(multiSigAddress,'32vYjxBb7pHJJyXgNk8UoK3BdRDxBzny2v')
       assert.equal(Address(sha256ripe160(hexToBytes(redeemScript)),network).toString(),
-        multiSigAddress)     
+        multiSigAddress)
+    })
+  })
+
+  describe('getOutType', function() {
+    it('works for p2sh', function() {
+      var script = Script.fromHex("a914e8c300c87986efa84c37c0519929019ef86eb5b487")
+      assert.equal(script.getOutType(), 'P2SH')
     })
 
+    it('works for pubkey', function() {
+      var script = Script.fromHex("76a9145a3acbc7bbcc97c5ff16f5909c9d7d3fadb293a888ac")
+      assert.equal(script.getOutType(), 'Pubkey')
+    })
+  })
+
+  describe('toAddress', function() {
+    it('works for p2sh type output', function() {
+      var script = Script.fromHex("a914e8c300c87986efa84c37c0519929019ef86eb5b487")
+      assert.equal(script.toAddress(), '3NukJ6fYZJ5Kk8bPjycAnruZkE5Q7UW7i8')
+    })
+
+    it('works for pubkey type output', function() {
+      var script = Script.fromHex("76a9145a3acbc7bbcc97c5ff16f5909c9d7d3fadb293a888ac")
+      assert.equal(script.toAddress(), '19E6FV3m3kEPoJD5Jz6dGKdKwTVvjsWUvu')
+    })
   })
 })