diff --git a/test_coverage.txt b/test_coverage.txt
index 2c9ca49..411bb3e 100644
--- a/test_coverage.txt
+++ b/test_coverage.txt
@@ -1,59 +1,55 @@
 
-github.com/conformal/btcutil/base58.go		 Base58Decode			 100.00% (20/20)
-github.com/conformal/btcutil/address.go		 DecodeAddr			 100.00% (18/18)
-github.com/conformal/btcutil/base58.go		 Base58Encode			 100.00% (15/15)
-github.com/conformal/btcutil/addrconvs.go	 DecodeAddress			 100.00% (14/14)
-github.com/conformal/btcutil/block.go		 Block.Tx			 100.00% (12/12)
-github.com/conformal/btcutil/block.go		 Block.Transactions		 100.00% (11/11)
-github.com/conformal/btcutil/block.go		 Block.TxShas			 100.00% (10/10)
-github.com/conformal/btcutil/address.go		 encodeAddress			 100.00% (9/9)
-github.com/conformal/btcutil/addrconvs.go	 EncodeScriptHash		 100.00% (8/8)
-github.com/conformal/btcutil/addrconvs.go	 EncodeAddress			 100.00% (8/8)
-github.com/conformal/btcutil/tx.go		 NewTxFromBytes			 100.00% (7/7)
-github.com/conformal/btcutil/block.go		 NewBlockFromBytes		 100.00% (7/7)
-github.com/conformal/btcutil/addrconvs.go	 encodeHashWithNetId		 100.00% (7/7)
-github.com/conformal/btcutil/block.go		 Block.Sha			 100.00% (5/5)
-github.com/conformal/btcutil/tx.go		 Tx.Sha				 100.00% (5/5)
-github.com/conformal/btcutil/block.go		 Block.TxSha			 100.00% (4/4)
-github.com/conformal/btcutil/hash160.go		 calcHash			 100.00% (2/2)
-github.com/conformal/btcutil/address.go		 NewAddressScriptHash		 100.00% (2/2)
-github.com/conformal/btcutil/address.go		 AddressPubKeyHash.ScriptAddress 100.00% (1/1)
-github.com/conformal/btcutil/block.go		 NewBlock			 100.00% (1/1)
-github.com/conformal/btcutil/block.go		 Block.SetHeight		 100.00% (1/1)
-github.com/conformal/btcutil/block.go		 Block.Height			 100.00% (1/1)
-github.com/conformal/btcutil/address.go		 AddressPubKey.EncodeAddress	 100.00% (1/1)
-github.com/conformal/btcutil/address.go		 AddressPubKey.ScriptAddress	 100.00% (1/1)
-github.com/conformal/btcutil/tx.go		 NewTx				 100.00% (1/1)
-github.com/conformal/btcutil/address.go		 AddressPubKey.String		 100.00% (1/1)
-github.com/conformal/btcutil/tx.go		 Tx.SetIndex			 100.00% (1/1)
-github.com/conformal/btcutil/tx.go		 Tx.Index			 100.00% (1/1)
-github.com/conformal/btcutil/address.go		 AddressScriptHash.ScriptAddress 100.00% (1/1)
-github.com/conformal/btcutil/hash160.go		 Hash160			 100.00% (1/1)
-github.com/conformal/btcutil/address.go		 AddressPubKeyHash.EncodeAddress 100.00% (1/1)
-github.com/conformal/btcutil/address.go		 AddressScriptHash.EncodeAddress 100.00% (1/1)
-github.com/conformal/btcutil/block.go		 NewBlockFromBlockAndBytes	 100.00% (1/1)
-github.com/conformal/btcutil/block.go		 OutOfRangeError.Error		 100.00% (1/1)
-github.com/conformal/btcutil/block.go		 Block.MsgBlock			 100.00% (1/1)
-github.com/conformal/btcutil/tx.go		 Tx.MsgTx			 100.00% (1/1)
-github.com/conformal/btcutil/appdata.go		 appDataDir			 92.00% (23/25)
-github.com/conformal/btcutil/address.go		 NewAddressScriptHashFromHash	 91.67% (11/12)
-github.com/conformal/btcutil/address.go		 NewAddressPubKeyHash		 91.67% (11/12)
-github.com/conformal/btcutil/addrconvs.go	 EncodePrivateKey		 90.91% (20/22)
-github.com/conformal/btcutil/block.go		 Block.TxLoc			 88.89% (8/9)
-github.com/conformal/btcutil/block.go		 Block.Bytes			 88.89% (8/9)
-github.com/conformal/btcutil/address.go		 AddressPubKey.serialize	 85.71% (6/7)
-github.com/conformal/btcutil/addrconvs.go	 DecodePrivateKey		 83.33% (20/24)
-github.com/conformal/btcutil/address.go		 NewAddressPubKey		 83.33% (15/18)
-github.com/conformal/btcutil/address.go		 checkBitcoinNet		 83.33% (5/6)
-github.com/conformal/btcutil/address.go		 AddressPubKeyHash.IsForNet	 60.00% (3/5)
-github.com/conformal/btcutil/address.go		 AddressPubKey.IsForNet		 60.00% (3/5)
-github.com/conformal/btcutil/address.go		 AddressScriptHash.IsForNet	 60.00% (3/5)
-github.com/conformal/btcutil/certgen.go		 NewTLSCertPair			 0.00% (0/50)
-github.com/conformal/btcutil/address.go		 AddressPubKey.AddressPubKeyHash 0.00% (0/3)
-github.com/conformal/btcutil/address.go		 AddressPubKeyHash.String	 0.00% (0/1)
-github.com/conformal/btcutil/appdata.go		 AppDataDir			 0.00% (0/1)
-github.com/conformal/btcutil/address.go		 AddressPubKey.SetFormat	 0.00% (0/1)
-github.com/conformal/btcutil/address.go		 AddressPubKey.Format		 0.00% (0/1)
-github.com/conformal/btcutil/address.go		 AddressScriptHash.String	 0.00% (0/1)
-github.com/conformal/btcutil			 ------------------------------- 79.70% (318/399)
+github.com/conformal/btcutil/base58.go	 Base58Decode			 100.00% (20/20)
+github.com/conformal/btcutil/base58.go	 Base58Encode			 100.00% (15/15)
+github.com/conformal/btcutil/block.go	 Block.Tx			 100.00% (12/12)
+github.com/conformal/btcutil/block.go	 Block.Transactions		 100.00% (11/11)
+github.com/conformal/btcutil/block.go	 Block.TxShas			 100.00% (10/10)
+github.com/conformal/btcutil/address.go	 encodeAddress			 100.00% (9/9)
+github.com/conformal/btcutil/block.go	 NewBlockFromBytes		 100.00% (7/7)
+github.com/conformal/btcutil/tx.go	 NewTxFromBytes			 100.00% (7/7)
+github.com/conformal/btcutil/block.go	 Block.Sha			 100.00% (5/5)
+github.com/conformal/btcutil/tx.go	 Tx.Sha				 100.00% (5/5)
+github.com/conformal/btcutil/block.go	 Block.TxSha			 100.00% (4/4)
+github.com/conformal/btcutil/hash160.go	 calcHash			 100.00% (2/2)
+github.com/conformal/btcutil/address.go	 NewAddressScriptHash		 100.00% (2/2)
+github.com/conformal/btcutil/address.go	 AddressPubKey.ScriptAddress	 100.00% (1/1)
+github.com/conformal/btcutil/tx.go	 Tx.MsgTx			 100.00% (1/1)
+github.com/conformal/btcutil/address.go	 AddressPubKeyHash.EncodeAddress 100.00% (1/1)
+github.com/conformal/btcutil/address.go	 AddressPubKeyHash.String	 100.00% (1/1)
+github.com/conformal/btcutil/address.go	 AddressScriptHash.EncodeAddress 100.00% (1/1)
+github.com/conformal/btcutil/address.go	 AddressScriptHash.ScriptAddress 100.00% (1/1)
+github.com/conformal/btcutil/address.go	 AddressScriptHash.String	 100.00% (1/1)
+github.com/conformal/btcutil/address.go	 AddressPubKey.EncodeAddress	 100.00% (1/1)
+github.com/conformal/btcutil/address.go	 AddressPubKey.String		 100.00% (1/1)
+github.com/conformal/btcutil/tx.go	 NewTx				 100.00% (1/1)
+github.com/conformal/btcutil/hash160.go	 Hash160			 100.00% (1/1)
+github.com/conformal/btcutil/tx.go	 Tx.SetIndex			 100.00% (1/1)
+github.com/conformal/btcutil/block.go	 OutOfRangeError.Error		 100.00% (1/1)
+github.com/conformal/btcutil/block.go	 Block.MsgBlock			 100.00% (1/1)
+github.com/conformal/btcutil/tx.go	 Tx.Index			 100.00% (1/1)
+github.com/conformal/btcutil/block.go	 Block.Height			 100.00% (1/1)
+github.com/conformal/btcutil/block.go	 Block.SetHeight		 100.00% (1/1)
+github.com/conformal/btcutil/block.go	 NewBlock			 100.00% (1/1)
+github.com/conformal/btcutil/block.go	 NewBlockFromBlockAndBytes	 100.00% (1/1)
+github.com/conformal/btcutil/address.go	 AddressPubKeyHash.ScriptAddress 100.00% (1/1)
+github.com/conformal/btcutil/address.go	 DecodeAddress			 95.65% (22/23)
+github.com/conformal/btcutil/appdata.go	 appDataDir			 92.00% (23/25)
+github.com/conformal/btcutil/address.go	 NewAddressPubKeyHash		 91.67% (11/12)
+github.com/conformal/btcutil/address.go	 NewAddressScriptHashFromHash	 91.67% (11/12)
+github.com/conformal/btcutil/address.go	 EncodePrivateKey		 90.91% (20/22)
+github.com/conformal/btcutil/block.go	 Block.TxLoc			 88.89% (8/9)
+github.com/conformal/btcutil/block.go	 Block.Bytes			 88.89% (8/9)
+github.com/conformal/btcutil/address.go	 AddressPubKey.serialize	 85.71% (6/7)
+github.com/conformal/btcutil/address.go	 NewAddressPubKey		 83.33% (15/18)
+github.com/conformal/btcutil/address.go	 checkBitcoinNet		 83.33% (5/6)
+github.com/conformal/btcutil/address.go	 DecodePrivateKey		 82.61% (19/23)
+github.com/conformal/btcutil/address.go	 AddressPubKeyHash.IsForNet	 60.00% (3/5)
+github.com/conformal/btcutil/address.go	 AddressScriptHash.IsForNet	 60.00% (3/5)
+github.com/conformal/btcutil/address.go	 AddressPubKey.IsForNet		 60.00% (3/5)
+github.com/conformal/btcutil/certgen.go	 NewTLSCertPair			 0.00% (0/50)
+github.com/conformal/btcutil/address.go	 AddressPubKey.AddressPubKeyHash 0.00% (0/3)
+github.com/conformal/btcutil/appdata.go	 AppDataDir			 0.00% (0/1)
+github.com/conformal/btcutil/address.go	 AddressPubKey.SetFormat	 0.00% (0/1)
+github.com/conformal/btcutil/address.go	 AddressPubKey.Format		 0.00% (0/1)
+github.com/conformal/btcutil		 ------------------------------- 78.14% (286/366)