diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_import_expire_isdead.py b/integration_tests/blockstack_integration_tests/scenarios/name_import_expire_isdead.py
index 5d4493063..9e4998db6 100644
--- a/integration_tests/blockstack_integration_tests/scenarios/name_import_expire_isdead.py
+++ b/integration_tests/blockstack_integration_tests/scenarios/name_import_expire_isdead.py
@@ -47,7 +47,7 @@ debug = True
 import_block = None
 
 fail_blocks = []
-NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK + 1 )
+NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK + 1, "test" )
 
 def scenario( wallets, **kw ):
 
diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_import_expire_reregister.py b/integration_tests/blockstack_integration_tests/scenarios/name_import_expire_reregister.py
index bb5ce1949..22031f93b 100644
--- a/integration_tests/blockstack_integration_tests/scenarios/name_import_expire_reregister.py
+++ b/integration_tests/blockstack_integration_tests/scenarios/name_import_expire_reregister.py
@@ -45,7 +45,7 @@ consensus = "17ac43c1d8549c3181b200f1bf97eb7d"
 
 debug = True
 import_block = None
-NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK + 1 )
+NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK + 1, "test" )
 
 def scenario( wallets, **kw ):
 
diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_import_import_expire_reregister.py b/integration_tests/blockstack_integration_tests/scenarios/name_import_import_expire_reregister.py
index 41b94999e..d31c4bfec 100644
--- a/integration_tests/blockstack_integration_tests/scenarios/name_import_import_expire_reregister.py
+++ b/integration_tests/blockstack_integration_tests/scenarios/name_import_import_expire_reregister.py
@@ -47,7 +47,7 @@ debug = True
 import_block_1 = None
 import_block_2 = None
 
-NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK + 1 )
+NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK + 1, "test" )
 
 def scenario( wallets, **kw ):
 
diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_import_renew_transfer_expire_reregister.py b/integration_tests/blockstack_integration_tests/scenarios/name_import_renew_transfer_expire_reregister.py
index 0be10ae72..40bc0bf8a 100644
--- a/integration_tests/blockstack_integration_tests/scenarios/name_import_renew_transfer_expire_reregister.py
+++ b/integration_tests/blockstack_integration_tests/scenarios/name_import_renew_transfer_expire_reregister.py
@@ -51,7 +51,7 @@ consensus = "17ac43c1d8549c3181b200f1bf97eb7d"
 
 debug = True
 transfer_block = None
-NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK + 1 )
+NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK + 1, "test" )
 
 def scenario( wallets, **kw ):
 
diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_import_renew_transfer_update.py b/integration_tests/blockstack_integration_tests/scenarios/name_import_renew_transfer_update.py
index 5f22b7fe9..6b8bec0d9 100644
--- a/integration_tests/blockstack_integration_tests/scenarios/name_import_renew_transfer_update.py
+++ b/integration_tests/blockstack_integration_tests/scenarios/name_import_renew_transfer_update.py
@@ -50,7 +50,7 @@ wallets = [
 consensus = "17ac43c1d8549c3181b200f1bf97eb7d"
 
 debug = True
-NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK + 1 )
+NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK + 1, "test" )
 
 def scenario( wallets, **kw ):
 
diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_import_renew_update_expire_reregister.py b/integration_tests/blockstack_integration_tests/scenarios/name_import_renew_update_expire_reregister.py
index e99e53aa3..42c4766e3 100644
--- a/integration_tests/blockstack_integration_tests/scenarios/name_import_renew_update_expire_reregister.py
+++ b/integration_tests/blockstack_integration_tests/scenarios/name_import_renew_update_expire_reregister.py
@@ -51,7 +51,7 @@ consensus = "17ac43c1d8549c3181b200f1bf97eb7d"
 
 debug = True
 update_block = None
-NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK + 1 )
+NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK + 1, "test" )
 
 def scenario( wallets, **kw ):
 
diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_import_renew_update_transfer.py b/integration_tests/blockstack_integration_tests/scenarios/name_import_renew_update_transfer.py
index f5c332cb8..38d3df2e1 100644
--- a/integration_tests/blockstack_integration_tests/scenarios/name_import_renew_update_transfer.py
+++ b/integration_tests/blockstack_integration_tests/scenarios/name_import_renew_update_transfer.py
@@ -51,7 +51,7 @@ consensus = "17ac43c1d8549c3181b200f1bf97eb7d"
 
 debug = True
 
-NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK + 1 )
+NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK + 1, "test" )
 
 def scenario( wallets, **kw ):
 
diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_import_revoke_expire_reregister.py b/integration_tests/blockstack_integration_tests/scenarios/name_import_revoke_expire_reregister.py
index e6729dd3e..73f107fc8 100644
--- a/integration_tests/blockstack_integration_tests/scenarios/name_import_revoke_expire_reregister.py
+++ b/integration_tests/blockstack_integration_tests/scenarios/name_import_revoke_expire_reregister.py
@@ -54,7 +54,7 @@ debug = True
 register_block = None
 revoke_blocok = None
 
-NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK + 1 )
+NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK + 1, "test" )
 
 def scenario( wallets, **kw ):
 
diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_import_transfer_update_transfer_condensed_multisig.py b/integration_tests/blockstack_integration_tests/scenarios/name_import_transfer_update_transfer_condensed_multisig.py
index f8ef3aa93..97baa2f65 100644
--- a/integration_tests/blockstack_integration_tests/scenarios/name_import_transfer_update_transfer_condensed_multisig.py
+++ b/integration_tests/blockstack_integration_tests/scenarios/name_import_transfer_update_transfer_condensed_multisig.py
@@ -26,6 +26,12 @@ import pybitcoin
 import json
 import virtualchain
 
+# activate multisig
+"""
+TEST ENV BLOCKSTACK_EPOCH_1_END_BLOCK 250
+TEST ENV BLOCKSTACK_EPOCH_2_NAMESPACE_LIFETIME_MULTIPLIER 1
+"""
+
 wallets = [
     testlib.Wallet( "5JesPiN68qt44Hc2nT8qmyZ1JDwHebfoh9KQ52Lazb1m1LaKNj9", 100000000000 ),
     testlib.Wallet( "5KHqsiU9qa77frZb6hQy9ocV7Sus9RWJcQGYYBJJBb2Efj1o77e", 100000000000 ),
diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_import_transfer_update_transfer_condensed_multisig_delays.py b/integration_tests/blockstack_integration_tests/scenarios/name_import_transfer_update_transfer_condensed_multisig_delays.py
index a9ce98fb4..ff44c3913 100644
--- a/integration_tests/blockstack_integration_tests/scenarios/name_import_transfer_update_transfer_condensed_multisig_delays.py
+++ b/integration_tests/blockstack_integration_tests/scenarios/name_import_transfer_update_transfer_condensed_multisig_delays.py
@@ -26,6 +26,12 @@ import pybitcoin
 import json
 import virtualchain
 
+# activate multisig
+"""
+TEST ENV BLOCKSTACK_EPOCH_1_END_BLOCK 250
+TEST ENV BLOCKSTACK_EPOCH_2_NAMESPACE_LIFETIME_MULTIPLIER 1
+"""
+
 wallets = [
     testlib.Wallet( "5JesPiN68qt44Hc2nT8qmyZ1JDwHebfoh9KQ52Lazb1m1LaKNj9", 100000000000 ),
     testlib.Wallet( "5KHqsiU9qa77frZb6hQy9ocV7Sus9RWJcQGYYBJJBb2Efj1o77e", 100000000000 ),
diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_import_transfer_update_transfer_condensed_multisig_singlesig.py b/integration_tests/blockstack_integration_tests/scenarios/name_import_transfer_update_transfer_condensed_multisig_singlesig.py
index 380fb7d74..d94d6157f 100644
--- a/integration_tests/blockstack_integration_tests/scenarios/name_import_transfer_update_transfer_condensed_multisig_singlesig.py
+++ b/integration_tests/blockstack_integration_tests/scenarios/name_import_transfer_update_transfer_condensed_multisig_singlesig.py
@@ -26,6 +26,12 @@ import pybitcoin
 import json
 import virtualchain
 
+# activate multisig
+"""
+TEST ENV BLOCKSTACK_EPOCH_1_END_BLOCK 250
+TEST ENV BLOCKSTACK_EPOCH_2_NAMESPACE_LIFETIME_MULTIPLIER 1
+"""
+
 wallets = [
     testlib.Wallet( "5JesPiN68qt44Hc2nT8qmyZ1JDwHebfoh9KQ52Lazb1m1LaKNj9", 100000000000 ),
     testlib.Wallet( "5KHqsiU9qa77frZb6hQy9ocV7Sus9RWJcQGYYBJJBb2Efj1o77e", 100000000000 ),
diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_import_update_transfer_revoke_verify_multi_multisig.py b/integration_tests/blockstack_integration_tests/scenarios/name_import_update_transfer_revoke_verify_multi_multisig.py
index 6eee796b9..d96c03639 100644
--- a/integration_tests/blockstack_integration_tests/scenarios/name_import_update_transfer_revoke_verify_multi_multisig.py
+++ b/integration_tests/blockstack_integration_tests/scenarios/name_import_update_transfer_revoke_verify_multi_multisig.py
@@ -29,6 +29,12 @@ import tempfile
 import os
 import virtualchain
 
+# activate multisig
+"""
+TEST ENV BLOCKSTACK_EPOCH_1_END_BLOCK 250
+TEST ENV BLOCKSTACK_EPOCH_2_NAMESPACE_LIFETIME_MULTIPLIER 1
+"""
+
 wallets = [
     testlib.Wallet( "5JesPiN68qt44Hc2nT8qmyZ1JDwHebfoh9KQ52Lazb1m1LaKNj9", 100000000000 ),
     testlib.Wallet( "5KHqsiU9qa77frZb6hQy9ocV7Sus9RWJcQGYYBJJBb2Efj1o77e", 100000000000 ),
diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_nextepoch_register.py b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_nextepoch_register.py
index aa0d8c78e..2384edbea 100644
--- a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_nextepoch_register.py
+++ b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_nextepoch_register.py
@@ -91,7 +91,7 @@ def check( state_engine ):
         return False
     
     # not preordered
-    preorder = state_engine.get_name_preorder( "foo.test", pybitcoin.make_pay_to_address_script(wallets[3].addr), wallets[4].addr, include_failed=True )
+    preorder = state_engine.get_name_preorder( "bar.test", pybitcoin.make_pay_to_address_script(wallets[3].addr), wallets[4].addr, include_failed=True )
     if preorder is not None:
         print "preorder exists"
         return False
diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_expire.py b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_expire.py
index e14f00b45..7ea662902 100644
--- a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_expire.py
+++ b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_expire.py
@@ -41,7 +41,7 @@ wallets = [
 ]
 
 consensus = "17ac43c1d8549c3181b200f1bf97eb7d"
-NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK + 1 )
+NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK + 1, "test" )
 
 def scenario( wallets, **kw ):
 
diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_expire_failure.py b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_expire_failure.py
index 199bd191b..02cf0dde6 100644
--- a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_expire_failure.py
+++ b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_expire_failure.py
@@ -44,7 +44,7 @@ wallets = [
 consensus = "17ac43c1d8549c3181b200f1bf97eb7d"
 
 # epoch 1 lifetime multiplier
-NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK - 1 )
+NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK - 1, "test" )
 
 def scenario( wallets, **kw ):
 
diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_expire_isdead.py b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_expire_isdead.py
index ddab2f08b..fe269ab2a 100644
--- a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_expire_isdead.py
+++ b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_expire_isdead.py
@@ -43,7 +43,7 @@ wallets = [
 consensus = "17ac43c1d8549c3181b200f1bf97eb7d"
 
 fail_blocks = []
-NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK + 1 )
+NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK + 1, "test" )
 
 def scenario( wallets, **kw ):
 
diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_expire_reregister.py b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_expire_reregister.py
index 455cad49a..350bcad47 100644
--- a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_expire_reregister.py
+++ b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_expire_reregister.py
@@ -61,7 +61,7 @@ def scenario( wallets, **kw ):
     testlib.blockstack_name_register( "foo.test", wallets[2].privkey, wallets[3].addr )
     testlib.next_block( **kw )
 
-    for i in xrange(0, 5 * blockstack_server.config.get_epoch_namespace_lifetime_multiplier( testlib.get_current_block(**kw) )):
+    for i in xrange(0, 5 * blockstack_server.config.get_epoch_namespace_lifetime_multiplier( testlib.get_current_block(**kw), "test" )):
         testlib.next_block( **kw )
 
     testlib.next_block( **kw )
diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_expire_snv.py b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_expire_snv.py
index 8958ebb4e..5a633b35c 100644
--- a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_expire_snv.py
+++ b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_expire_snv.py
@@ -40,7 +40,7 @@ snv_block_id = None
 last_consensus = None
 
 # do the 2nd epoch
-NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK + 1 )
+NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK + 1, "test" )
 
 def scenario( wallets, **kw ):
 
diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_multisig.py b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_multisig.py
index d5a2b7e8e..1b26596dc 100644
--- a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_multisig.py
+++ b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_multisig.py
@@ -25,6 +25,12 @@ import testlib
 import pybitcoin
 import virtualchain
 
+# activate multisig
+"""
+TEST ENV BLOCKSTACK_EPOCH_1_END_BLOCK 250
+TEST ENV BLOCKSTACK_EPOCH_2_NAMESPACE_LIFETIME_MULTIPLIER 1
+"""
+
 wallets = [
     testlib.Wallet( "5JesPiN68qt44Hc2nT8qmyZ1JDwHebfoh9KQ52Lazb1m1LaKNj9", 100000000000 ),
     testlib.Wallet( "5KHqsiU9qa77frZb6hQy9ocV7Sus9RWJcQGYYBJJBb2Efj1o77e", 100000000000 ),
diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_nextepoch_renew.py b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_nextepoch_renew.py
index c227d7b44..f0c276f2b 100644
--- a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_nextepoch_renew.py
+++ b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_nextepoch_renew.py
@@ -64,8 +64,8 @@ def scenario( wallets, **kw ):
     # next epoch takes effect...
     testlib.next_block( **kw )
 
-    # wait for a bit more (namespace lifetime should have 5x'ed)
-    for i in xrange(0, 40):
+    # wait for a bit more (namespace lifetime should have 2x'ed)
+    for i in xrange(0, 10):
         testlib.next_block( **kw )
 
     resp = testlib.blockstack_name_renew( "foo.test", wallets[3].privkey )
@@ -107,8 +107,8 @@ def check( state_engine ):
     if name_rec['address'] != wallets[3].addr or name_rec['sender'] != pybitcoin.make_pay_to_address_script(wallets[3].addr):
         return False
 
-    # renewed (52 blocks later)
-    if name_rec['last_renewed'] - 52 != name_rec['first_registered']:
+    # renewed (22 blocks later)
+    if name_rec['last_renewed'] - 22 != name_rec['first_registered']:
         print name_rec['last_renewed']
         print name_rec['first_registered']
         return False
diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_revoke_isdead.py b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_revoke_isdead.py
index 443d0e708..4291e154a 100644
--- a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_revoke_isdead.py
+++ b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_revoke_isdead.py
@@ -43,7 +43,7 @@ wallets = [
 consensus = "17ac43c1d8549c3181b200f1bf97eb7d"
 
 fail_blocks = []
-NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK + 1 )
+NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK + 1, "test" )
 
 def scenario( wallets, **kw ):
 
diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_revoke_reregister.py b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_revoke_reregister.py
index cd368afb5..f03bf3eb4 100644
--- a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_revoke_reregister.py
+++ b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_revoke_reregister.py
@@ -42,7 +42,7 @@ wallets = [
 
 consensus = "17ac43c1d8549c3181b200f1bf97eb7d"
 fail_blocks = []
-NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK + 1 )
+NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK + 1, "test" )
 
 def scenario( wallets, **kw ):
 
diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_revoke_reregister_newowner.py b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_revoke_reregister_newowner.py
index b83ec0a25..27eaef263 100644
--- a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_revoke_reregister_newowner.py
+++ b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_revoke_reregister_newowner.py
@@ -44,7 +44,7 @@ consensus = "17ac43c1d8549c3181b200f1bf97eb7d"
 
 fail_blocks = []
 
-NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK + 1 )
+NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK + 1, "test" )
 
 def scenario( wallets, **kw ):
 
diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_transfer_update_expire_reregister_delays.py b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_transfer_update_expire_reregister_delays.py
index fb824ffa4..f6617d8f5 100644
--- a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_transfer_update_expire_reregister_delays.py
+++ b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_transfer_update_expire_reregister_delays.py
@@ -54,7 +54,7 @@ update_blocks = []
 transfer_recipients = []
 update_hashes = []
 
-NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK + 1 )
+NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK + 1, "test" )
 
 def scenario( wallets, **kw ):
 
diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_transfer_update_transfer_condensed_multisig.py b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_transfer_update_transfer_condensed_multisig.py
index 970c56033..a51f6a8a5 100644
--- a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_transfer_update_transfer_condensed_multisig.py
+++ b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_transfer_update_transfer_condensed_multisig.py
@@ -26,6 +26,12 @@ import pybitcoin
 import json
 import virtualchain
 
+# activate multisig
+"""
+TEST ENV BLOCKSTACK_EPOCH_1_END_BLOCK 250
+TEST ENV BLOCKSTACK_EPOCH_2_NAMESPACE_LIFETIME_MULTIPLIER 1
+"""
+
 wallets = [
     testlib.Wallet( "5JesPiN68qt44Hc2nT8qmyZ1JDwHebfoh9KQ52Lazb1m1LaKNj9", 100000000000 ),
     testlib.Wallet( "5KHqsiU9qa77frZb6hQy9ocV7Sus9RWJcQGYYBJJBb2Efj1o77e", 100000000000 ),
@@ -60,13 +66,13 @@ def scenario( wallets, **kw ):
 
     testlib.next_block( **kw )
 
-    resp = testlib.blockstack_name_preorder( "foo.test", wallets[2].privkey, wallets[3].addr )
+    resp = testlib.blockstack_name_preorder( "foo.test", wallets[2].privkey, wallets[3].addr, wallet=wallets[3] )
     if debug or 'error' in resp:
         print json.dumps( resp, indent=4 )
 
     testlib.next_block( **kw )
     
-    resp = testlib.blockstack_name_register( "foo.test", wallets[2].privkey, wallets[3].addr )
+    resp = testlib.blockstack_name_register( "foo.test", wallets[2].privkey, wallets[3].addr, wallet=wallets[3] )
     if debug or 'error' in resp:
         print json.dumps( resp, indent=4 )
 
diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_transfer_update_transfer_condensed_multisig_singlesig.py b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_transfer_update_transfer_condensed_multisig_singlesig.py
index 428a692d1..731cddfa5 100644
--- a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_transfer_update_transfer_condensed_multisig_singlesig.py
+++ b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_transfer_update_transfer_condensed_multisig_singlesig.py
@@ -26,6 +26,12 @@ import pybitcoin
 import json
 import virtualchain
 
+# activate multisig
+"""
+TEST ENV BLOCKSTACK_EPOCH_1_END_BLOCK 250
+TEST ENV BLOCKSTACK_EPOCH_2_NAMESPACE_LIFETIME_MULTIPLIER 1
+"""
+
 wallets = [
     testlib.Wallet( "5JesPiN68qt44Hc2nT8qmyZ1JDwHebfoh9KQ52Lazb1m1LaKNj9", 100000000000 ),
     testlib.Wallet( "5KHqsiU9qa77frZb6hQy9ocV7Sus9RWJcQGYYBJJBb2Efj1o77e", 100000000000 ),
@@ -60,13 +66,13 @@ def scenario( wallets, **kw ):
 
     testlib.next_block( **kw )
 
-    resp = testlib.blockstack_name_preorder( "foo.test", wallets[2].privkey, wallets[3].addr )
+    resp = testlib.blockstack_name_preorder( "foo.test", wallets[2].privkey, wallets[3].addr, wallet=wallets[3] )
     if debug or 'error' in resp:
         print json.dumps( resp, indent=4 )
 
     testlib.next_block( **kw )
     
-    resp = testlib.blockstack_name_register( "foo.test", wallets[2].privkey, wallets[3].addr )
+    resp = testlib.blockstack_name_register( "foo.test", wallets[2].privkey, wallets[3].addr, wallet=wallets[3] )
     if debug or 'error' in resp:
         print json.dumps( resp, indent=4 )
 
diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_transfer_update_transfer_condensed_multisig_singlesig_delays.py b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_transfer_update_transfer_condensed_multisig_singlesig_delays.py
index e5ae3bbe7..f2081d4a8 100644
--- a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_transfer_update_transfer_condensed_multisig_singlesig_delays.py
+++ b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_transfer_update_transfer_condensed_multisig_singlesig_delays.py
@@ -26,6 +26,12 @@ import pybitcoin
 import json
 import virtualchain
 
+# activate multisig
+"""
+TEST ENV BLOCKSTACK_EPOCH_1_END_BLOCK 250
+TEST ENV BLOCKSTACK_EPOCH_2_NAMESPACE_LIFETIME_MULTIPLIER 1
+"""
+
 wallets = [
     testlib.Wallet( "5JesPiN68qt44Hc2nT8qmyZ1JDwHebfoh9KQ52Lazb1m1LaKNj9", 100000000000 ),
     testlib.Wallet( "5KHqsiU9qa77frZb6hQy9ocV7Sus9RWJcQGYYBJJBb2Efj1o77e", 100000000000 ),
diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_update_atlas_storage.py b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_update_atlas_storage.py
index 9bc60350c..f9473ddbf 100644
--- a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_update_atlas_storage.py
+++ b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_update_atlas_storage.py
@@ -96,6 +96,9 @@ def scenario( wallets, **kw ):
 
     # propagate the zonefile hash
     res = testlib.blockstack_cli_set_zonefile_hash( "foo.test", value_hash ) 
+    if 'error' in res:
+        print json.dumps(res, indent=4, sort_keys=True)
+        return False
 
     for i in xrange(0, 12):
         testlib.next_block( **kw )
diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_update_expire_reregister.py b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_update_expire_reregister.py
index 97c76566b..6d187c958 100644
--- a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_update_expire_reregister.py
+++ b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_update_expire_reregister.py
@@ -51,7 +51,7 @@ consensus = "17ac43c1d8549c3181b200f1bf97eb7d"
 update_hashes = []
 update_blocks = []
 
-NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK + 1 )
+NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK + 1, "test" )
 
 def scenario( wallets, **kw ):
 
diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_update_listimmutablehistory.py b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_update_listimmutablehistory.py
index 9aef69b11..a44d9f9f8 100644
--- a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_update_listimmutablehistory.py
+++ b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_update_listimmutablehistory.py
@@ -122,9 +122,9 @@ def scenario( wallets, **kw ):
     legacy_hash = pybitcoin.hex_hash160( legacy_txt )
 
     result = testlib.blockstack_name_update( "foo.test", legacy_hash, wallets[3].privkey )
-    data_history_1.append("missing zonefile")
-    data_history_2.append("missing zonefile")
-    data_history_3.append("missing zonefile")
+    data_history_1.append("non-standard zonefile")
+    data_history_2.append("non-standard zonefile")
+    data_history_3.append("non-standard zonefile")
     testlib.next_block( **kw )
 
     rc = blockstack_client.storage.put_immutable_data( None, result['transaction_hash'], data_hash=legacy_hash, data_text=legacy_txt )
diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_update_revoke_reregister_update.py b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_update_revoke_reregister_update.py
index 6d627af8e..e80e38ec6 100644
--- a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_update_revoke_reregister_update.py
+++ b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_update_revoke_reregister_update.py
@@ -42,7 +42,7 @@ wallets = [
 
 consensus = "17ac43c1d8549c3181b200f1bf97eb7d"
 
-NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK + 1 )
+NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK + 1, "test" )
 
 def scenario( wallets, **kw ):
 
diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_update_transfer_expire_reregister.py b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_update_transfer_expire_reregister.py
index a05eff9a0..79ca607f7 100644
--- a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_update_transfer_expire_reregister.py
+++ b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_update_transfer_expire_reregister.py
@@ -55,7 +55,7 @@ update_blocks = []
 transfer_recipients = []
 update_hashes = []
 
-NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK + 1 )
+NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK + 1, "test" )
 
 def scenario( wallets, **kw ):
 
diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_update_transfer_expire_reregister_delays.py b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_update_transfer_expire_reregister_delays.py
index cd7b3c71f..0abb5964e 100644
--- a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_update_transfer_expire_reregister_delays.py
+++ b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_update_transfer_expire_reregister_delays.py
@@ -55,7 +55,7 @@ update_blocks = []
 transfer_recipients = []
 update_hashes = []
 
-NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK + 1 )
+NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK + 1, "test" )
 
 def scenario( wallets, **kw ):
     
diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_update_transfer_renew_expire_reregister.py b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_update_transfer_renew_expire_reregister.py
index 2caddc707..2275e9bcb 100644
--- a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_update_transfer_renew_expire_reregister.py
+++ b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_update_transfer_renew_expire_reregister.py
@@ -57,7 +57,7 @@ update_hashes = []
 
 renew_blocks = []
 
-NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK + 1 )
+NAMESPACE_LIFETIME_MULTIPLIER = blockstack_server.get_epoch_namespace_lifetime_multiplier( blockstack_server.EPOCH_1_END_BLOCK + 1, "test" )
 
 def scenario( wallets, **kw ):
     
diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_update_transfer_renew_revoke_verify_multi_multisig.py b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_update_transfer_renew_revoke_verify_multi_multisig.py
index 7a428d6f5..c3ff2b0ea 100644
--- a/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_update_transfer_renew_revoke_verify_multi_multisig.py
+++ b/integration_tests/blockstack_integration_tests/scenarios/name_preorder_register_update_transfer_renew_revoke_verify_multi_multisig.py
@@ -29,6 +29,12 @@ import tempfile
 import os
 import virtualchain
 
+# activate multisig
+"""
+TEST ENV BLOCKSTACK_EPOCH_1_END_BLOCK 250
+TEST ENV BLOCKSTACK_EPOCH_2_NAMESPACE_LIFETIME_MULTIPLIER 1
+"""
+
 wallets = [
     testlib.Wallet( "5JesPiN68qt44Hc2nT8qmyZ1JDwHebfoh9KQ52Lazb1m1LaKNj9", 100000000000 ),
     testlib.Wallet( "5KHqsiU9qa77frZb6hQy9ocV7Sus9RWJcQGYYBJJBb2Efj1o77e", 100000000000 ),
diff --git a/integration_tests/blockstack_integration_tests/scenarios/rpc_register_multisig.py b/integration_tests/blockstack_integration_tests/scenarios/rpc_register_multisig.py
new file mode 100644
index 000000000..b6f75aec3
--- /dev/null
+++ b/integration_tests/blockstack_integration_tests/scenarios/rpc_register_multisig.py
@@ -0,0 +1,157 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+    Blockstack
+    ~~~~~
+    copyright: (c) 2014-2015 by Halfmoon Labs, Inc.
+    copyright: (c) 2016 by Blockstack.org
+
+    This file is part of Blockstack
+
+    Blockstack is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Blockstack is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+    You should have received a copy of the GNU General Public License
+    along with Blockstack. If not, see <http://www.gnu.org/licenses/>.
+""" 
+
+import testlib
+import pybitcoin
+import time
+import json
+import sys
+import os
+import blockstack_client
+import virtualchain
+
+# activate multisig
+"""
+TEST ENV BLOCKSTACK_EPOCH_1_END_BLOCK 250
+TEST ENV BLOCKSTACK_EPOCH_2_NAMESPACE_LIFETIME_MULTIPLIER 1
+"""
+
+wallets = [
+    testlib.Wallet( "5JesPiN68qt44Hc2nT8qmyZ1JDwHebfoh9KQ52Lazb1m1LaKNj9", 100000000000 ),
+    testlib.Wallet( "5KHqsiU9qa77frZb6hQy9ocV7Sus9RWJcQGYYBJJBb2Efj1o77e", 100000000000 ),
+    testlib.Wallet( "5Kg5kJbQHvk1B64rJniEmgbD83FpZpbw2RjdAZEzTefs9ihN3Bz", 100000000000 ),
+    testlib.MultisigWallet(2, "5JfHdMq9XnZ9mwW5H6LsfVCn9u6iGAj2FCVYtfhcHn72Tphvm5P", "5JaqLZaKD7cgkfsxSZBNiu6gaFxo1XAiTXw1mhtatipNNCtZBZG", "5KNsAkiHRDZb5Yyedxov2Fncr6CcNPV52yqJbzQ8M2W6dkg2qJp"),
+    testlib.MultisigWallet(2, "5JPrkpfLT3rDf1Lgm1DpA2Cfepwf9wCtEbDx1HSEdd4J2R5YMxZ", "5JiALcfvzFsKcvLnHf7ECgLdp6FxbcAXB1GPvEYP7HeigbDCQ9E", "5KScD5XL5Hj83Yjvm3u4HD78vSYwFRyq9StTLPnrWrCTGiqTvVP"),
+    testlib.MultisigWallet(2, '5JPR5iVN8KGMdU9JfzoTCsipXazUcZPRY8zp7f3g8FRff2HBaAV', '5KTTwEyATY8v12MjNdoeA1u2ZGqgjnBNcyZjk3YSkiVJWYxqBSm', '5KQ1s8UEYz3oyFRUejBvb1imMdtpoP98w6NQYGxQsSo3u6DmztZ'),
+    testlib.MultisigWallet(2, '5JpAkdEJuzF8E74UptksRLiB6Bf9QnwxGQutJTRWo5EAGVZfXmY', '5Hyc4wreVpZyzcfb56Zt1ymovda2xGucGZsAwoQz34iYK6aEKhR', '5JypKiQGiaD8AN6X86xtnuQYj7nnpLvp4VfcTVdDh4yFkLewAGx')
+]
+
+consensus = "17ac43c1d8549c3181b200f1bf97eb7d"
+
+def scenario( wallets, **kw ):
+
+    testlib.blockstack_namespace_preorder( "test", wallets[1].addr, wallets[0].privkey )
+    testlib.next_block( **kw )
+
+    testlib.blockstack_namespace_reveal( "test", wallets[1].addr, 52595, 250, 4, [6,5,4,3,2,1,0,0,0,0,0,0,0,0,0,0], 10, 10, wallets[0].privkey )
+    testlib.next_block( **kw )
+
+    testlib.blockstack_namespace_ready( "test", wallets[1].privkey )
+    testlib.next_block( **kw )
+    
+    wallet = testlib.blockstack_client_initialize_wallet( "0123456789abcdef", wallets[2].privkey, wallets[3].privkey, None )
+    resp = testlib.blockstack_cli_register( "foo.test", "0123456789abcdef" )
+    if 'error' in resp:
+        print >> sys.stderr, json.dumps(resp, indent=4, sort_keys=True)
+        return False
+   
+    # wait for the preorder to get confirmed
+    for i in xrange(0, 12):
+        testlib.next_block( **kw )
+
+    # wait for the poller to pick it up
+    print >> sys.stderr, "Waiting 10 seconds for the backend to submit the register"
+    time.sleep(10)
+
+    # wait for the register to get confirmed 
+    for i in xrange(0, 12):
+        testlib.next_block( **kw )
+
+    print >> sys.stderr, "Waiting 10 seconds for the backend to acknowledge registration"
+    time.sleep(10)
+
+    # wait for update to get confirmed 
+    for i in xrange(0, 12):
+        testlib.next_block( **kw )
+
+    print >> sys.stderr, "Waiting 10 seconds for the backend to acknowledge update"
+    time.sleep(10)
+
+
+
+def check( state_engine ):
+
+    # not revealed, but ready 
+    ns = state_engine.get_namespace_reveal( "test" )
+    if ns is not None:
+        print "namespace reveal exists"
+        return False 
+
+    ns = state_engine.get_namespace( "test" )
+    if ns is None:
+        print "no namespace"
+        return False 
+
+    if ns['namespace_id'] != 'test':
+        print "wrong namespace"
+        return False 
+    
+    # registered 
+    name_rec = state_engine.get_name( "foo.test" )
+    if name_rec is None:
+        print "name does not exist"
+        return False 
+
+    # owned by the right address 
+    owner_address = wallets[3].addr
+    if name_rec['address'] != owner_address or name_rec['sender'] != virtualchain.make_payment_script(owner_address):
+        print "sender is wrong"
+        print "%s != %s or %s != %s" % (name_rec['address'], owner_address, name_rec['sender'], virtualchain.make_payment_script(owner_address))
+        return False 
+
+    # all queues are drained 
+    queue_info = testlib.blockstack_client_queue_state()
+    if len(queue_info) > 0:
+        print "Still in queue:\n%s" % json.dumps(queue_info, indent=4, sort_keys=True)
+        return False
+
+    # have an update hash 
+    if 'value_hash' not in name_rec or name_rec.get('value_hash', None) is None:
+        print "No value hash"
+        return False 
+
+    # have a zonefile 
+    zonefile = testlib.blockstack_get_zonefile( name_rec['value_hash'] )
+    if zonefile is None or 'error' in zonefile:
+        if zonefile is not None:
+            print "zonefile lookup error: %s" % zonefile['error']
+        else:
+            print "no zonefile returned"
+        return False
+
+    # hashes to this zonefile 
+    if blockstack_client.hash_zonefile( zonefile ) != name_rec['value_hash']:
+        print "wrong zonefile: %s != %s" % (blockstack_client.hash_zonefile(zonefile), name_rec['value_hash'])
+        return False
+
+    # verify that the profile is there 
+    profile = testlib.blockstack_get_profile( "foo.test" )
+    if profile is None or 'error' in profile:
+        if profile is None:
+            print "no profile returned"
+        else:
+            print "profile lookup error: %s" % profile['error']
+
+        return False
+
+    return True
diff --git a/integration_tests/blockstack_integration_tests/scenarios/rpc_register_transfer_multisig_singlesig.py b/integration_tests/blockstack_integration_tests/scenarios/rpc_register_transfer_multisig_singlesig.py
new file mode 100644
index 000000000..6e443ce3e
--- /dev/null
+++ b/integration_tests/blockstack_integration_tests/scenarios/rpc_register_transfer_multisig_singlesig.py
@@ -0,0 +1,166 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+    Blockstack
+    ~~~~~
+    copyright: (c) 2014-2015 by Halfmoon Labs, Inc.
+    copyright: (c) 2016 by Blockstack.org
+
+    This file is part of Blockstack
+
+    Blockstack is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Blockstack is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+    You should have received a copy of the GNU General Public License
+    along with Blockstack. If not, see <http://www.gnu.org/licenses/>.
+""" 
+
+import testlib
+import pybitcoin
+import time
+import json
+import sys
+import blockstack_client
+import virtualchain
+
+# activate multisig
+"""
+TEST ENV BLOCKSTACK_EPOCH_1_END_BLOCK 250
+TEST ENV BLOCKSTACK_EPOCH_2_NAMESPACE_LIFETIME_MULTIPLIER 1
+"""
+
+wallets = [
+    testlib.Wallet( "5JesPiN68qt44Hc2nT8qmyZ1JDwHebfoh9KQ52Lazb1m1LaKNj9", 100000000000 ),
+    testlib.Wallet( "5KHqsiU9qa77frZb6hQy9ocV7Sus9RWJcQGYYBJJBb2Efj1o77e", 100000000000 ),
+    testlib.MultisigWallet(2, "5JfHdMq9XnZ9mwW5H6LsfVCn9u6iGAj2FCVYtfhcHn72Tphvm5P", "5JaqLZaKD7cgkfsxSZBNiu6gaFxo1XAiTXw1mhtatipNNCtZBZG", "5KNsAkiHRDZb5Yyedxov2Fncr6CcNPV52yqJbzQ8M2W6dkg2qJp"),
+    testlib.MultisigWallet(2, "5JPrkpfLT3rDf1Lgm1DpA2Cfepwf9wCtEbDx1HSEdd4J2R5YMxZ", "5JiALcfvzFsKcvLnHf7ECgLdp6FxbcAXB1GPvEYP7HeigbDCQ9E", "5KScD5XL5Hj83Yjvm3u4HD78vSYwFRyq9StTLPnrWrCTGiqTvVP"),
+    testlib.Wallet( "5KEpiSRr1BrT8vRD7LKGCEmudokTh1iMHbiThMQpLdwBwhDJB1T", 5500 )
+]
+
+consensus = "17ac43c1d8549c3181b200f1bf97eb7d"
+zonefile_hash = None
+
+def scenario( wallets, **kw ):
+
+    global zonefile_hash
+
+    testlib.blockstack_namespace_preorder( "test", wallets[1].addr, wallets[0].privkey )
+    testlib.next_block( **kw )
+
+    testlib.blockstack_namespace_reveal( "test", wallets[1].addr, 52595, 250, 4, [6,5,4,3,2,1,0,0,0,0,0,0,0,0,0,0], 10, 10, wallets[0].privkey )
+    testlib.next_block( **kw )
+
+    testlib.blockstack_namespace_ready( "test", wallets[1].privkey )
+    testlib.next_block( **kw )
+
+    wallet = testlib.blockstack_client_initialize_wallet( "0123456789abcdef", wallets[2].privkey, wallets[3].privkey, None )
+    resp = testlib.blockstack_cli_register( "foo.test", "0123456789abcdef" )
+    if 'error' in resp:
+        print >> sys.stderr, json.dumps(resp, indent=4, sort_keys=True)
+        return False
+   
+    # wait for the preorder to get confirmed
+    for i in xrange(0, 12):
+        testlib.next_block( **kw )
+
+    # wait for the poller to pick it up
+    print >> sys.stderr, "Waiting 10 seconds for the backend to submit the register"
+    time.sleep(10)
+
+    # wait for the register to get confirmed 
+    for i in xrange(0, 12):
+        # warn the serialization checker that this changes behavior from 0.13
+        print "BLOCKSTACK_SERIALIZATION_CHECK_IGNORE value_hash"
+        sys.stdout.flush()
+        
+        testlib.next_block( **kw )
+
+    print >> sys.stderr, "Waiting 10 seconds for the backend to acknowledge registration"
+    time.sleep(10)
+
+    # wait for update to get confirmed 
+    for i in xrange(0, 12):
+        # warn the serialization checker that this changes behavior from 0.13
+        print "BLOCKSTACK_SERIALIZATION_CHECK_IGNORE value_hash"
+        sys.stdout.flush()
+        
+        testlib.next_block( **kw )
+
+    print >> sys.stderr, "Waiting 10 seconds for the backend to acknowledge update"
+    time.sleep(10)
+
+    # transfer to a new address 
+    resp = testlib.blockstack_cli_transfer( "foo.test", wallets[4].addr, "0123456789abcdef" )
+
+    if 'error' in resp:
+        print >> sys.stderr, "transfer error: %s" % resp['error']
+        return False
+
+    # wait for it to go through 
+    for i in xrange(0, 12):
+        # warn the serialization checker that this changes behavior from 0.13
+        print "BLOCKSTACK_SERIALIZATION_CHECK_IGNORE value_hash"
+        sys.stdout.flush()
+
+        testlib.next_block( **kw )
+
+    print >> sys.stderr, "Waiting 10 seconds for the backend to acknowledge the transfer"
+    time.sleep(10)
+
+    testlib.next_block(**kw)
+
+
+def check( state_engine ):
+
+    global zonefile_hash
+
+    # not revealed, but ready 
+    ns = state_engine.get_namespace_reveal( "test" )
+    if ns is not None:
+        print "namespace reveal exists"
+        return False 
+
+    ns = state_engine.get_namespace( "test" )
+    if ns is None:
+        print "no namespace"
+        return False 
+
+    if ns['namespace_id'] != 'test':
+        print "wrong namespace"
+        return False 
+    
+    # registered 
+    name_rec = state_engine.get_name( "foo.test" )
+    if name_rec is None:
+        print "name does not exist"
+        return False 
+
+    # owned by
+    owner_address = wallets[4].addr
+    if name_rec['address'] != owner_address or name_rec['sender'] != virtualchain.make_payment_script(owner_address):
+        print "sender is wrong"
+        return False 
+
+    # all queues are drained 
+    queue_info = testlib.blockstack_client_queue_state()
+    if len(queue_info) > 0:
+        print "Still in queue:\n%s" % json.dumps(queue_info, indent=4, sort_keys=True)
+        return False
+
+    # doesn't show up in listing
+    names_owned = testlib.blockstack_cli_names()
+    if 'error' in names_owned:
+        print "rpc names: %s" % names_owned['error']
+        return False
+
+    if len(names_owned['names_owned']) > 0:
+        print "still owned: %s" % names_owned['names_owned']
+        return False
+    
+    return True