diff --git a/contrib/testgen/gen_base58_test_vectors.py b/contrib/testgen/gen_base58_test_vectors.py
index a2d5dbe93e..cdf68c1091 100755
--- a/contrib/testgen/gen_base58_test_vectors.py
+++ b/contrib/testgen/gen_base58_test_vectors.py
@@ -15,12 +15,12 @@
 from binascii import b2a_hex
 
 # key types
-PUBKEY_ADDRESS = 76
-SCRIPT_ADDRESS = 16
-PUBKEY_ADDRESS_TEST = 140
-SCRIPT_ADDRESS_TEST = 19
-PRIVKEY = 204
-PRIVKEY_TEST = 239
+PUBKEY_ADDRESS = 30
+SCRIPT_ADDRESS = 10
+PUBKEY_ADDRESS_TEST = 30
+SCRIPT_ADDRESS_TEST = 10
+PRIVKEY = 140
+PRIVKEY_TEST = 158
 
 metadata_keys = ['isPrivkey', 'isTestnet', 'addrType', 'isCompressed']
 # templates for valid sequences
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 317ceb7205..3ca73511ff 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -189,7 +189,7 @@ class CMainParams : public CChainParams
         startNewChain = false;
         nSwitchDifficultyBlock = 795350; // approx: September 22, 2021
 
-        genesis = CreateGenesisBlock(1513619300, 626614, UintToArith256(consensus.powLimit).GetCompact(), 1, (1 * COIN));
+        genesis = CreateGenesisBlock(1513619300, 626614, 0x1e0fffff, 1, (1 * COIN));
         if (startNewChain == true) {
             MineGenesis(genesis, consensus.powLimit, true);
         }
@@ -346,7 +346,7 @@ class CTestNetParams : public CChainParams
         startNewChain = false;
         nSwitchDifficultyBlock = 5000; // ~ 1 week
 
-        genesis = CreateGenesisBlock(1515641597, 747, UintToArith256(consensus.powLimit).GetCompact(), 1, (1 * COIN));
+        genesis = CreateGenesisBlock(1515641597, 747, 0x2000ffff, 1, (1 * COIN));
         if (startNewChain == true) {
             MineGenesis(genesis, consensus.powLimit, true);
         }
@@ -480,7 +480,7 @@ class CRegTestParams : public CChainParams
         startNewChain = false;
         nSwitchDifficultyBlock = 500;
 
-        genesis = CreateGenesisBlock(1513619951, 1754, UintToArith256(consensus.powLimit).GetCompact(), 1, (1 * COIN));
+        genesis = CreateGenesisBlock(1513619951, 1754, 0x1f0fffff, 1, (1 * COIN));
         if (startNewChain == true) {
             MineGenesis(genesis, consensus.powLimit, true);
         }
@@ -609,7 +609,7 @@ class CPrivateNetParams : public CChainParams
         startNewChain = false;
         nSwitchDifficultyBlock = 500000;
 
-        genesis = CreateGenesisBlock(1559867972, 60883, UintToArith256(consensus.powLimit).GetCompact(), 1, (1 * COIN));
+        genesis = CreateGenesisBlock(1559867972, 60883, 0x1f00ffff, 1, (1 * COIN));
         if (startNewChain == true) {
             MineGenesis(genesis, consensus.powLimit, true);
         }
diff --git a/src/dynode-payments.cpp b/src/dynode-payments.cpp
index 2ab81c7f99..6c70106888 100644
--- a/src/dynode-payments.cpp
+++ b/src/dynode-payments.cpp
@@ -272,7 +272,7 @@ void CDynodePayments::FillBlockPayee(CMutableTransaction& txNew, int nBlockHeigh
 
     // make sure it's not filled yet
     txoutDynodeRet = CTxOut();
-    CAmount dynodePayment = GetFluidDynodeReward(nBlockHeight);
+    CAmount dynodePayment = GetFluidDynodeReward(nBlockHeight, Params().GetConsensus());
 
     // split reward between miner ...
     txoutDynodeRet = CTxOut(dynodePayment, payee);
@@ -593,7 +593,7 @@ bool CDynodeBlockPayees::IsTransactionValid(const CTransaction& txNew, const int
 
     int nMaxSignatures = 0;
     std::string strPayeesPossible = "";
-    CAmount nDynodePayment = GetFluidDynodeReward(nHeight);
+    CAmount nDynodePayment = GetFluidDynodeReward(nHeight, Params().GetConsensus());
 
     //require at least DNPAYMENTS_SIGNATURES_REQUIRED signatures
 
diff --git a/src/dynode.cpp b/src/dynode.cpp
index 2e7de1716f..efe8cfc5de 100644
--- a/src/dynode.cpp
+++ b/src/dynode.cpp
@@ -356,7 +356,7 @@ void CDynode::UpdateLastPaid(const CBlockIndex* pindex, int nMaxBlocksToScanBack
             if (!ReadBlockFromDisk(block, BlockReading, Params().GetConsensus())) // shouldn't really happen
                 continue;
 
-            CAmount nDynodePayment = GetFluidDynodeReward(BlockReading->nHeight);
+            CAmount nDynodePayment = GetFluidDynodeReward(BlockReading->nHeight, Params().GetConsensus());
 
             for (const auto& txout : block.vtx[0]->vout)
                 if (dnpayee == txout.scriptPubKey && nDynodePayment == txout.nValue) {
diff --git a/src/fluid/fluid.cpp b/src/fluid/fluid.cpp
index f23b193e75..10dbe9243e 100644
--- a/src/fluid/fluid.cpp
+++ b/src/fluid/fluid.cpp
@@ -483,13 +483,13 @@ bool CFluid::ParseMintKey(const int64_t& nTime, CDynamicAddress& destination, CA
     return true;
 }
 
-bool GetFluidBlock(const CBlockIndex* pblockindex, CBlock& block)
+bool GetFluidBlock(const CBlockIndex* pblockindex, CBlock& block, const Consensus::Params& consensusParams)
 {
     if (pblockindex != nullptr) {
         // Check for invalid block position and file.
         const CDiskBlockPos pos = pblockindex->GetBlockPos();
         if (pos.nFile > -1 && pos.nPos > 0) {
-            if (!ReadBlockFromDisk(block, pblockindex, Params().GetConsensus())) {
+            if (!ReadBlockFromDisk(block, pblockindex, consensusParams)) {
                 LogPrintf("Unable to read from disk! Highly unlikely but has occured, may be bug or damaged blockchain copy!\n");
                 return false;
             }
@@ -502,10 +502,10 @@ bool GetFluidBlock(const CBlockIndex* pblockindex, CBlock& block)
     return true;
 }
 
-bool CFluid::GetMintingInstructions(const CBlockIndex* pblockindex, CDynamicAddress& toMintAddress, CAmount& mintAmount)
+bool CFluid::GetMintingInstructions(const CBlockIndex* pblockindex, CDynamicAddress& toMintAddress, CAmount& mintAmount, const Consensus::Params& consensusParams)
 {
     CBlock block;
-    if (GetFluidBlock(pblockindex, block)) {
+    if (GetFluidBlock(pblockindex, block, consensusParams)) {
         for (const CTransactionRef& tx : block.vtx) {
             for (const CTxOut& txout : tx->vout) {
                 if (txout.scriptPubKey.IsProtocolInstruction(MINT_TX)) {
@@ -542,25 +542,25 @@ bool CFluid::CheckTransactionInRecord(const CScript& fluidInstruction, CBlockInd
     return false;
 }
 
-CAmount GetStandardPoWBlockPayment(const int& nHeight)
+CAmount GetStandardPoWBlockPayment(const int& nHeight, const Consensus::Params& consensusParams)
 {
     if (nHeight == 1) {
         CAmount nSubsidy = INITIAL_SUPERBLOCK_PAYMENT;
         LogPrint("superblock creation", "GetStandardPoWBlockPayment() : create=%s nSubsidy=%d\n", FormatMoney(nSubsidy), nSubsidy);
         return nSubsidy;
-    } else if (nHeight > 1 && nHeight <= Params().GetConsensus().nRewardsStart) {
+    } else if (nHeight > 1 && nHeight <= consensusParams.nRewardsStart) {
         LogPrint("zero-reward block creation", "GetStandardPoWBlockPayment() : create=%s nSubsidy=%d\n", FormatMoney(BLOCKCHAIN_INIT_REWARD), BLOCKCHAIN_INIT_REWARD);
         return BLOCKCHAIN_INIT_REWARD; // Burn transaction fees
-    } else if (nHeight > Params().GetConsensus().nRewardsStart) {
+    } else if (nHeight > consensusParams.nRewardsStart) {
         LogPrint("creation", "GetStandardPoWBlockPayment() : create=%s PoW Reward=%d\n", FormatMoney(PHASE_1_POW_REWARD), PHASE_1_POW_REWARD);
         return PHASE_1_POW_REWARD; // 1 DYN  and burn transaction fees
     } else
         return BLOCKCHAIN_INIT_REWARD; // Burn transaction fees
 }
 
-CAmount GetStandardDynodePayment(const int& nHeight)
+CAmount GetStandardDynodePayment(const int& nHeight, const Consensus::Params& consensusParams)
 {
-    if (nHeight > Params().GetConsensus().nDynodePaymentsStartBlock) {
+    if (nHeight > consensusParams.nDynodePaymentsStartBlock) {
         LogPrint("fluid", "GetStandardDynodePayment() : create=%s DN Payment=%d\n", FormatMoney(PHASE_2_DYNODE_PAYMENT), PHASE_2_DYNODE_PAYMENT);
         return PHASE_2_DYNODE_PAYMENT; // 1.618 DYN
     } else {
diff --git a/src/fluid/fluid.h b/src/fluid/fluid.h
index 1d7d9b9a3d..70d1bf18d6 100644
--- a/src/fluid/fluid.h
+++ b/src/fluid/fluid.h
@@ -63,7 +63,7 @@ class CFluid : public CFluidParameters, public COperations
     bool ParseMintKey(const int64_t& nTime, CDynamicAddress& destination, CAmount& coinAmount, const std::string& uniqueIdentifier, const bool txCheckPurpose = false);
     bool ProcessFluidToken(const std::string& consentToken, std::vector<std::string>& ptrs, const int& strVecNo);
 
-    bool GetMintingInstructions(const CBlockIndex* pblockindex, CDynamicAddress& toMintAddress, CAmount& mintAmount);
+    bool GetMintingInstructions(const CBlockIndex* pblockindex, CDynamicAddress& toMintAddress, CAmount& mintAmount, const Consensus::Params& consensusParams);
     bool ValidationProcesses(CValidationState& state, const CScript& txOut, const CAmount& txValue);
 
     bool CheckTransactionToBlock(const CTransaction& transaction, const CBlockHeader& blockHeader);
@@ -77,8 +77,8 @@ class CFluid : public CFluidParameters, public COperations
 };
 
 /** Standard Reward Payment Determination Functions */
-CAmount GetStandardPoWBlockPayment(const int& nHeight);
-CAmount GetStandardDynodePayment(const int& nHeight);
+CAmount GetStandardPoWBlockPayment(const int& nHeight, const Consensus::Params& consensusParams);
+CAmount GetStandardDynodePayment(const int& nHeight, const Consensus::Params& consensusParams);
 
 void BuildFluidInformationIndex(CBlockIndex* pindex, CAmount& nExpectedBlockValue, bool fDynodePaid);
 bool IsTransactionFluid(const CScript& txOut);
@@ -88,7 +88,7 @@ int GetFluidOpCode(const CScript& fluidScript);
 std::vector<unsigned char> CharVectorFromString(const std::string& str);
 std::string StringFromCharVector(const std::vector<unsigned char>& vch);
 std::vector<unsigned char> FluidScriptToCharVector(const CScript& fluidScript);
-bool GetFluidBlock(const CBlockIndex* pblockindex, CBlock& block);
+bool GetFluidBlock(const CBlockIndex* pblockindex, CBlock& block, const Consensus::Params& consensusParams);
 
 extern CFluid fluid;
 
diff --git a/src/fluid/fluiddb.cpp b/src/fluid/fluiddb.cpp
index c96cf5d850..a7baca9b4b 100644
--- a/src/fluid/fluiddb.cpp
+++ b/src/fluid/fluiddb.cpp
@@ -9,47 +9,47 @@
 #include "fluidmint.h"
 #include "fluidsovereign.h"
 
-CAmount GetFluidDynodeReward(const int nHeight)
+CAmount GetFluidDynodeReward(const int nHeight, const Consensus::Params& consensusParams)
 {
     if (fluid.FLUID_ACTIVATE_HEIGHT > nHeight)
-        return GetStandardDynodePayment(nHeight);
+        return GetStandardDynodePayment(nHeight, consensusParams);
 
     if (!CheckFluidDynodeDB())
-        return GetStandardDynodePayment(nHeight);
+        return GetStandardDynodePayment(nHeight, consensusParams);
 
     if (pFluidDynodeDB->IsEmpty())
-        return GetStandardDynodePayment(nHeight);
+        return GetStandardDynodePayment(nHeight, consensusParams);
 
     CFluidDynode lastDynodeRecord;
     if (!pFluidDynodeDB->GetLastFluidDynodeRecord(lastDynodeRecord, nHeight)) {
-        return GetStandardDynodePayment(nHeight);
+        return GetStandardDynodePayment(nHeight, consensusParams);
     }
     if (lastDynodeRecord.DynodeReward > 0) {
         return lastDynodeRecord.DynodeReward;
     } else {
-        return GetStandardDynodePayment(nHeight);
+        return GetStandardDynodePayment(nHeight, consensusParams);
     }
 }
 
-CAmount GetFluidMiningReward(const int nHeight)
+CAmount GetFluidMiningReward(const int nHeight, const Consensus::Params& consensusParams)
 {
     if (fluid.FLUID_ACTIVATE_HEIGHT > nHeight)
-        return GetStandardPoWBlockPayment(nHeight);
+        return GetStandardPoWBlockPayment(nHeight, consensusParams);
 
     if (!CheckFluidMiningDB())
-        return GetStandardPoWBlockPayment(nHeight);
+        return GetStandardPoWBlockPayment(nHeight, consensusParams);
 
     if (pFluidMiningDB->IsEmpty())
-        return GetStandardPoWBlockPayment(nHeight);
+        return GetStandardPoWBlockPayment(nHeight, consensusParams);
 
     CFluidMining lastMiningRecord;
     if (!pFluidMiningDB->GetLastFluidMiningRecord(lastMiningRecord, nHeight)) {
-        return GetStandardPoWBlockPayment(nHeight);
+        return GetStandardPoWBlockPayment(nHeight, consensusParams);
     }
     if (lastMiningRecord.MiningReward > 0) {
         return lastMiningRecord.MiningReward;
     } else {
-        return GetStandardPoWBlockPayment(nHeight);
+        return GetStandardPoWBlockPayment(nHeight, consensusParams);
     }
 }
 
diff --git a/src/fluid/fluiddb.h b/src/fluid/fluiddb.h
index 6e47959720..00599eb822 100644
--- a/src/fluid/fluiddb.h
+++ b/src/fluid/fluiddb.h
@@ -4,6 +4,7 @@
 #define FLUID_DB_H
 
 #include "amount.h"
+#include "consensus/params.h"
 
 class CDynamicAddress;
 class CFluidDynode;
@@ -11,8 +12,8 @@ class CFluidMining;
 class CFluidMint;
 class CFluidSovereign;
 
-CAmount GetFluidDynodeReward(const int nHeight);
-CAmount GetFluidMiningReward(const int nHeight);
+CAmount GetFluidDynodeReward(const int nHeight, const Consensus::Params& consensusParams);
+CAmount GetFluidMiningReward(const int nHeight, const Consensus::Params& consensusParams);
 bool GetMintingInstructions(const int nHeight, CFluidMint& fluidMint);
 bool IsSovereignAddress(const CDynamicAddress& inputAddress);
 bool GetAllFluidDynodeRecords(std::vector<CFluidDynode>& dynodeEntries);
diff --git a/src/hash.cpp b/src/hash.cpp
index fb915496ab..31ba1c580b 100644
--- a/src/hash.cpp
+++ b/src/hash.cpp
@@ -88,23 +88,14 @@ void BIP32Hash(const ChainCode& chainCode, unsigned int nChild, unsigned char he
 
 #define ROTL(x, b) (uint64_t)(((x) << (b)) | ((x) >> (64 - (b))))
 
-#define SIPROUND           \
-    do {                   \
-        v0 += v1;          \
-        v1 = ROTL(v1, 13); \
-        v1 ^= v0;          \
-        v0 = ROTL(v0, 32); \
-        v2 += v3;          \
-        v3 = ROTL(v3, 16); \
-        v3 ^= v2;          \
-        v0 += v3;          \
-        v3 = ROTL(v3, 21); \
-        v3 ^= v0;          \
-        v2 += v1;          \
-        v1 = ROTL(v1, 17); \
-        v1 ^= v2;          \
-        v2 = ROTL(v2, 32); \
-    } while (0)
+#define SIPROUND do { \
+    v0 += v1; v1 = ROTL(v1, 13); v1 ^= v0; \
+    v0 = ROTL(v0, 32); \
+    v2 += v3; v3 = ROTL(v3, 16); v3 ^= v2; \
+    v0 += v3; v3 = ROTL(v3, 21); v3 ^= v0; \
+    v2 += v1; v1 = ROTL(v1, 17); v1 ^= v2; \
+    v2 = ROTL(v2, 32); \
+} while (0)
 
 CSipHasher::CSipHasher(uint64_t k0, uint64_t k1)
 {
@@ -113,6 +104,7 @@ CSipHasher::CSipHasher(uint64_t k0, uint64_t k1)
     v[2] = 0x6c7967656e657261ULL ^ k0;
     v[3] = 0x7465646279746573ULL ^ k1;
     count = 0;
+    tmp = 0;
 }
 
 CSipHasher& CSipHasher::Write(uint64_t data)
diff --git a/src/miner/miner-util.cpp b/src/miner/miner-util.cpp
index 252f8b7185..71e3798eb0 100644
--- a/src/miner/miner-util.cpp
+++ b/src/miner/miner-util.cpp
@@ -272,7 +272,7 @@ std::unique_ptr<CBlockTemplate> CreateNewBlock(const CChainParams& chainparams,
             }
         }
 
-        CAmount blockReward = GetFluidMiningReward(nHeight);
+        CAmount blockReward = GetFluidMiningReward(nHeight, chainparams.GetConsensus());
         CDynamicAddress mintAddress;
         CAmount fluidIssuance = 0;
         CFluidMint fluidMint;
diff --git a/src/pow.cpp b/src/pow.cpp
index b65eb12c54..71ba5e4590 100644
--- a/src/pow.cpp
+++ b/src/pow.cpp
@@ -86,11 +86,11 @@ bool CheckProofOfWork(uint256 hash, unsigned int nBits, const Consensus::Params&
 
     // Check range
     if (fNegative || bnTarget == 0 || fOverflow || bnTarget > UintToArith256(params.powLimit))
-        return error("CheckProofOfWork(): nBits below minimum work");
+        return error("CheckProofOfWork(): nBits below minimum work, nBits: 0x%x, minWork: 0x%x", bnTarget.GetCompact(), UintToArith256(params.powLimit).GetCompact());
 
     // Check proof of work matches claimed amount
     if (UintToArith256(hash) > bnTarget)
-        return error("CheckProofOfWork(): hash doesn't match nBits");
+        return error("CheckProofOfWork(): hash doesn't match nBits, hash: 0x%x, bnTarget: 0x%x", UintToArith256(hash).GetCompact(), bnTarget.GetCompact());
 
     return true;
 }
diff --git a/src/rpc/fluid.cpp b/src/rpc/fluid.cpp
index 7fe3d5f020..fe9f8c6b86 100644
--- a/src/rpc/fluid.cpp
+++ b/src/rpc/fluid.cpp
@@ -448,10 +448,10 @@ UniValue getfluidhistoryraw(const JSONRPCRequest& request)
         obj.push_back(Pair("total_minted", FormatMoney(totalMintedCoins)));
         obj.push_back(Pair("total_fluid_fee_cost", FormatMoney(totalFluidTxCost)));
 
-        CAmount dynodeReward = GetFluidDynodeReward(chainActive.Tip()->nHeight);
+        CAmount dynodeReward = GetFluidDynodeReward(chainActive.Tip()->nHeight, Params().GetConsensus());
         obj.push_back(Pair("current_dynode_reward", FormatMoney(dynodeReward)));
 
-        CAmount miningAmount = GetFluidMiningReward(chainActive.Tip()->nHeight);
+        CAmount miningAmount = GetFluidMiningReward(chainActive.Tip()->nHeight, Params().GetConsensus());
         obj.push_back(Pair("current_mining_reward", FormatMoney(miningAmount)));
 
         obj.push_back(Pair("total_fluid_transactions", nTotal));
@@ -621,10 +621,10 @@ UniValue getfluidhistory(const JSONRPCRequest& request)
         obj.push_back(Pair("total_minted", FormatMoney(totalMintedCoins)));
         obj.push_back(Pair("total_fluid_fee_cost", FormatMoney(totalFluidTxCost)));
 
-        CAmount dynodeReward = GetFluidDynodeReward(chainActive.Tip()->nHeight);
+        CAmount dynodeReward = GetFluidDynodeReward(chainActive.Tip()->nHeight, Params().GetConsensus());
         obj.push_back(Pair("current_dynode_reward", FormatMoney(dynodeReward)));
 
-        CAmount miningAmount = GetFluidMiningReward(chainActive.Tip()->nHeight);
+        CAmount miningAmount = GetFluidMiningReward(chainActive.Tip()->nHeight, Params().GetConsensus());
         obj.push_back(Pair("current_mining_reward", FormatMoney(miningAmount)));
 
         obj.push_back(Pair("total_fluid_transactions", nTotal));
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 3a5421b543..b81e4cc3fd 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -895,7 +895,7 @@ UniValue getblocktemplate(const JSONRPCRequest& request)
     CScript scriptMint;
     if (areWeMinting) {
         // Add minting output to superblock payments
-        CAmount fluidIssuance = nCoinbaseValue - GetFluidDynodeReward(nHeight) - GetFluidMiningReward(nHeight);
+        CAmount fluidIssuance = nCoinbaseValue - GetFluidDynodeReward(nHeight, Params().GetConsensus()) - GetFluidMiningReward(nHeight, Params().GetConsensus());
         if (fluidIssuance > 0) {
             UniValue entry(UniValue::VOBJ);
             CDynamicAddress mintAddress = fluidMint.GetDestinationAddress();
@@ -1150,7 +1150,7 @@ UniValue getsubsidy(const JSONRPCRequest& request)
     if (nHeight < 0)
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Block height out of range");
 
-    return (uint64_t)GetFluidDynodeReward(nHeight) + GetFluidMiningReward(nHeight);
+    return (uint64_t)GetFluidDynodeReward(nHeight, Params().GetConsensus()) + GetFluidMiningReward(nHeight, Params().GetConsensus());
 }
 
 static const CRPCCommand commands[] =
diff --git a/src/test/addrman_tests.cpp b/src/test/addrman_tests.cpp
index 1af58c63f3..a5e005179c 100644
--- a/src/test/addrman_tests.cpp
+++ b/src/test/addrman_tests.cpp
@@ -204,10 +204,10 @@ BOOST_AUTO_TEST_CASE(addrman_select)
     BOOST_CHECK(addrman.size() == 7);
 
     // Test 12: Select pulls from new and tried regardless of port number.
-    BOOST_CHECK(addrman.Select().ToString() == "250.4.6.6:8333");
+    BOOST_CHECK(addrman.Select().ToString() == "250.1.1.1:8333");
     BOOST_CHECK(addrman.Select().ToString() == "250.3.2.2:33300");
-    BOOST_CHECK(addrman.Select().ToString() == "250.3.3.3:33300");
-    BOOST_CHECK(addrman.Select().ToString() == "250.4.4.4:8333");
+    BOOST_CHECK(addrman.Select().ToString() == "250.3.1.1:8333");
+    BOOST_CHECK(addrman.Select().ToString() == "250.1.1.1:8333");
 }
 
 BOOST_AUTO_TEST_CASE(addrman_new_collisions)
diff --git a/src/test/alert_tests.cpp b/src/test/alert_tests.cpp
index 4fa731bce4..afb397f2a7 100644
--- a/src/test/alert_tests.cpp
+++ b/src/test/alert_tests.cpp
@@ -22,6 +22,7 @@
 #include <boost/foreach.hpp>
 #include <boost/test/unit_test.hpp>
 
+#ifdef ENABLE_ALERT_TESTS
 //
 // Sign a CAlert and serialize it
 //
@@ -234,3 +235,4 @@ BOOST_AUTO_TEST_CASE(AlertNotify)
 }
 
 BOOST_AUTO_TEST_SUITE_END()
+#endif // ENABLE_ALERT_TESTS
\ No newline at end of file
diff --git a/src/test/audit_tests.cpp b/src/test/audit_tests.cpp
index 104cf61e71..5eaf8096f4 100644
--- a/src/test/audit_tests.cpp
+++ b/src/test/audit_tests.cpp
@@ -122,8 +122,6 @@ BOOST_AUTO_TEST_CASE(audit_test1)
         //test OwnerFullObjectPath Length GOOD
         audit.vchOwnerFullObjectPath = vchFromString(strLen191);
         BOOST_CHECK(audit.ValidateValues(strErrorMsg) == true);
-
-        std::cout << "Exit: audit_test1\n";
     }
 } //audit_test1
 
@@ -167,8 +165,6 @@ BOOST_AUTO_TEST_CASE(audit_test2)
 
         //test valid signature
         BOOST_CHECK(audit.CheckSignature(pubKey.Raw()));
-
-        std::cout << "Exit: audit_test2\n";
     }
 } //audit_test2
 
diff --git a/src/test/bdap_link_tests.cpp b/src/test/bdap_link_tests.cpp
index d01876a786..ae4d3427d9 100644
--- a/src/test/bdap_link_tests.cpp
+++ b/src/test/bdap_link_tests.cpp
@@ -38,9 +38,6 @@ BOOST_AUTO_TEST_CASE(bdap_link_test1)
     CKeyID keyID = pubKey.GetID();
     CDynamicAddress address = CDynamicAddress(keyID);
     BOOST_CHECK(SignatureProofIsValid(address, strTestFQDN, vchSignature) == true);
-
-    std::cout << "Exit: bdap_link_test1\n";
-
 }
 
 BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
diff --git a/src/test/bdap_vgp_message_tests.cpp b/src/test/bdap_vgp_message_tests.cpp
index 7c4ba30122..c74753bd63 100644
--- a/src/test/bdap_vgp_message_tests.cpp
+++ b/src/test/bdap_vgp_message_tests.cpp
@@ -256,9 +256,6 @@ BOOST_AUTO_TEST_CASE(bdap_vgp_message_test1)
 
     //message values should match (original vs decrypted retrieved value)
     BOOST_CHECK(vchMessage == retrievedvchMessage);
-
-    std::cout << "Exit: bdap_vgp_message_tests\n";
-
 }
 
 BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
diff --git a/src/test/bip32_tests.cpp b/src/test/bip32_tests.cpp
index 82d592af00..232e26e1ce 100644
--- a/src/test/bip32_tests.cpp
+++ b/src/test/bip32_tests.cpp
@@ -120,11 +120,11 @@ void RunTest(const TestVector &test) {
 
         CDataStream ssPub(SER_DISK, CLIENT_VERSION);
         ssPub << pubkeyNew;
-        BOOST_CHECK(ssPub.size() == BIP32_EXTKEY_SIZE);
+        BOOST_CHECK(ssPub.size() == BIP32_EXTKEY_SIZE + 1);
 
         CDataStream ssPriv(SER_DISK, CLIENT_VERSION);
         ssPriv << keyNew;
-        BOOST_CHECK(ssPriv.size() == BIP32_EXTKEY_SIZE);
+        BOOST_CHECK(ssPriv.size() == BIP32_EXTKEY_SIZE + 1);
 
         CExtPubKey pubCheck;
         CExtKey privCheck;
diff --git a/src/test/blockencodings_tests.cpp b/src/test/blockencodings_tests.cpp
index 32ebecf4f1..c105af7137 100644
--- a/src/test/blockencodings_tests.cpp
+++ b/src/test/blockencodings_tests.cpp
@@ -31,7 +31,7 @@ static CBlock BuildBlockTestCase() {
     block.vtx[0] = MakeTransactionRef(tx);
     block.nVersion = 42;
     block.hashPrevBlock = GetRandHash();
-    block.nBits = 0x207fffff;
+    block.nBits = 0x1f0fffff;
 
     tx.vin[0].prevout.hash = GetRandHash();
     tx.vin[0].prevout.n = 0;
@@ -284,7 +284,7 @@ BOOST_AUTO_TEST_CASE(EmptyBlockRoundTripTest)
     block.vtx[0] = MakeTransactionRef(std::move(coinbase));
     block.nVersion = 42;
     block.hashPrevBlock = GetRandHash();
-    block.nBits = 0x207fffff;
+    block.nBits = 0x1f0fffff;
 
     bool mutated;
     block.hashMerkleRoot = BlockMerkleRoot(block, &mutated);
diff --git a/src/test/bloom_tests.cpp b/src/test/bloom_tests.cpp
index e3cdf358e6..438d676bdb 100644
--- a/src/test/bloom_tests.cpp
+++ b/src/test/bloom_tests.cpp
@@ -84,7 +84,7 @@ BOOST_AUTO_TEST_CASE(bloom_create_insert_serialize_with_tweak)
 
 BOOST_AUTO_TEST_CASE(bloom_create_insert_key)
 {
-    std::string strSecret = std::string("7sQb6QHALg4XyHsJHsSNXnEHGhZfzTTUPJXJqaqK7CavQkiL9Ms");
+    std::string strSecret = std::string("5h9NM2YJhDXv2ti18CsQMQtKBBAbUtL7ENtHGd7gC1VrQd9pzLU");
     CDynamicSecret vchSecret;
     BOOST_CHECK(vchSecret.SetString(strSecret));
 
@@ -100,7 +100,7 @@ BOOST_AUTO_TEST_CASE(bloom_create_insert_key)
     CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
     stream << filter;
 
-    std::vector<unsigned char> vch = ParseHex("038fc16b080000000000000001");
+    std::vector<unsigned char> vch = ParseHex("0399786e080000000000000001");
     std::vector<char> expected(vch.size());
 
     for (unsigned int i = 0; i < vch.size(); i++)
diff --git a/src/test/certificate_tests.cpp b/src/test/certificate_tests.cpp
index 091c0a602e..814329d185 100644
--- a/src/test/certificate_tests.cpp
+++ b/src/test/certificate_tests.cpp
@@ -530,8 +530,6 @@ BOOST_AUTO_TEST_CASE(certificate_test1)
 
         //test SCTList records good
         BOOST_CHECK(testCertificate.ValidateValues(strErrorMsg) == true);
-
-        std::cout << "Exit: certificate_test1\n";
     }
 } //certificate_test1
 
@@ -609,10 +607,6 @@ BOOST_AUTO_TEST_CASE(certificate_test2)
 
         //Check Issuer Signature using Unknown BAD
         BOOST_CHECK(!(testCertificate.CheckIssuerSignature(UnknownPublicKey) == true));
-
-
-        std::cout << "Exit: certificate_test2\n";
-
     }
 } //certificate_test2
 
diff --git a/src/test/certificatex509_tests.cpp b/src/test/certificatex509_tests.cpp
index 260166a5d8..9ce3f4a3ac 100644
--- a/src/test/certificatex509_tests.cpp
+++ b/src/test/certificatex509_tests.cpp
@@ -176,8 +176,6 @@ BOOST_AUTO_TEST_CASE(certificatex509_test1)
 
         //test ExternalVerificationFile GOOD
         BOOST_CHECK(testCertificate.ValidateValues(strErrorMsg) == true);
-
-        std::cout << "Exit: certificatex509_test1\n";
     }
 } //certificate_test1
 
@@ -307,9 +305,6 @@ BOOST_AUTO_TEST_CASE(certificatex509_test2)
         //Check against PEM BAD
         BOOST_CHECK(!(testCertificate.ValidatePEM(strErrorMsg) == true));
 
-
-        std::cout << "Exit: certificatex509_test2\n";
-
     }
 } //certificatex509_test2
 
@@ -432,8 +427,6 @@ BOOST_AUTO_TEST_CASE(certificatex509_test3)
 
         //check against good certificate, GOOD
         BOOST_CHECK((testCertificate2.UnserializeFromTx(txRef2) == true));
-
-        std::cout << "Exit: certificatex509_test3\n";
     }
 } //certificatex509_test3
 
diff --git a/src/test/crypto_tests.cpp b/src/test/crypto_tests.cpp
index 3eb865b5e2..389151d2c7 100644
--- a/src/test/crypto_tests.cpp
+++ b/src/test/crypto_tests.cpp
@@ -128,7 +128,7 @@ BOOST_AUTO_TEST_CASE(sha256_testvectors) {
     TestSHA256("This is exactly 64 bytes long, not counting the terminating byte",
                "ab64eff7e88e2e46165e29f2bce41826bd4c7b3552f6b382a9e7d3af47c245f8");
     TestSHA256("As Dynamic relies on 80 byte header hashes, we want to have an example for that.",
-               "7406e8de7d6e4fffc573daef05aefb8806e7790f55eab5576f31349743cca743");
+               "1081ad1ae6dfe30142596bf64b1544383be4e7436b1ebba971ea6d1d38d69c06");
     TestSHA256(std::string(1000000, 'a'),
                "cdc76e5c9914fb9281a1c7e284d73e67f1809a48a497200e046d39ccc7112cd0");
     TestSHA256(test1, "a316d55510b49662420f49d145d42fb83f31ef8dc016aa4e32df049991a91e26");
diff --git a/src/test/data/base58_keys_invalid.json b/src/test/data/base58_keys_invalid.json
index e04a1106cd..a397361600 100755
--- a/src/test/data/base58_keys_invalid.json
+++ b/src/test/data/base58_keys_invalid.json
@@ -6,147 +6,147 @@
         "x"
     ], 
     [
-        "8212abd8rrzcJmBG9n7VmSpaMfPRXhyHkQtNXFAMPCUqQTF9Kmsk5VF3b81x1qt9tRsQ2REKQ6j"
+        "7NRyX3xZRfRiB44CPaYfyX7Jf69ozsYxHNpJkJ5D7AFCzZ1g56J"
     ], 
     [
-        "5CPYCiRk7LjiYQc45GQTgqNjYw5tWeCZd1NWvevf6SQfJvDm9vK"
+        "XLEYAdHQ6sDVsvXA64zQY27WRFYDFkEJ7vr5VESrSB3inHM3MQc2Z"
     ], 
     [
-        "2UB8YkLAsoJWEsw6daxKvo5W4NVjLSB8Bsko6UCWMrLnoFKgETXdKa2XcvoWdjeeLbKqRcaWwGvq"
+        "8fph7nruxRksMV6Ew3gMg6oEdkAxZTijUNrs3g711CMVFRWKGyC"
     ], 
     [
-        "9sW9vnbLHfdcqhU2n5bLAFUksSgCiMBVmdn6Pae3iTYo49aSqZeS"
+        "2hAti8CTvHMQpFKYWk2du7ABz8N8nnKjnHp"
     ], 
     [
-        "2FeLT8g7q25cvVmUjQnXvTt7rpWDtRjq2oi9F9zj3rLWxNKSoKcPLob6TEB2RAeumauRzj5Em5uL"
+        "jnzGey27DWbVimuQCEPa61f7S5h8ySwaLwFZpouPGj1z2r82wWhinJAmSERjxy2iu4ENhYN1Kh7"
     ], 
     [
-        "7Vbg3REusN6tagLwHkz4P71VZtp8oTTtETmaTFJfypdX4J7vBmp6CMzWpNV3RUdv7TST2nigUz2oU"
+        "5hGY6WCovnFMLMKemGyXH28sJ5V5BqB2qV4WMNXsPGLJm1zw95R"
     ], 
     [
-        "7obK6DhucEuvCinKLAUNYMPXNEFCHcErXa61wi2sMi66owinM4E8YD4rkgHVvxpv3ZGxFNXUyCA"
+        "MkeKwoQQqii5tnWHGVZpxndTPg47HQwauqC1DCVif6a31Ky7UeoL"
     ], 
     [
-        "3FPe28dxJDhEmkAbGVgsT5XFpBwyM48FK4veyiQVgAKvQLTea2U"
+        "PciPcqBFtrz9FkGRWj1Hd34H5vgLRXgZeeqYrv9AR7aRqTtYgQ"
     ], 
     [
-        "2ULU3PB7u3rxfUXKVb5mZ4ijXbj85LN99s7zess5XPZEX1DJvanHoY6dLvYnkLtQDWQ2qCq1GWSA"
+        "296qFS5YunG6Y25j6snpXnVwXaMcEn8fGhxGmwZiCK8RtYHnSqE2LCkaPzUFrpWqL7bZrudKxTmQ"
     ], 
     [
-        "7VBmPmJMUFwYhgktivvqBZcPzqdKPy4S4RRTACdwTiV6wNpkpXEmp3tvDhzkqdyFhXdJ88Q5T9mka"
+        "4foNmQtYhe8bCZRoqem8e6TxWvmeGvx7VQ9cxRdgRYGoqPT5zS41ZS2PY7P7egRcG2REuMmpyJYm"
     ], 
     [
-        "2Zx1G5CMrEC4Y8EBVxvepmM1aiXv7CenqUR1dZBxC4PFUv9jAAm8TUxD4SKC2ArwKawA3Y4rhC2v"
+        "9Jsj6JpfFtU7Fdqso5WfSA6tFKgJY4ydNvfEdt1h5tz7qaEhCFP"
     ], 
     [
-        "yaWZmeqWr5Mea62ECoMPzVkXxHGDF6LtCfc"
+        "RowBA1e481DSuo267by7J1JTEvVhT8AGz6"
     ], 
     [
-        "7VPs36WGcbdFsCBsMXExgBoMeme8T7eJ4g3UMqQrhrA2Lyys5vi3dgH43nbz1AV4YFz3ZRKLdFsnu"
+        "2cTkedMs3nrcrpA7mZmSiNLc7VZ6eipTCJpZrDzmgnfeAdgV32P"
     ], 
     [
-        "2DS5LTr3AgrTGoBD3nqXWDPtCMd98mkop4wxaVfRWwPFYvmpXP5hG5bKzVVzvsKzP89THiiRd3Pr"
+        "4pPKg6JjHd3de5bbGpGLPvrREh16igvFsyhHj9AYw25QU7pWHR2upsCkBxSwgxszjowpJuTJhQLuw"
     ], 
     [
-        "DeRXybcZve86XXanvmLG9XwFadEh8GjH2Y"
+        "NZtNfApaFETzXXfB1n1syBK15Rn4q4jv7NKWkoQgn5MnNkyeZmrR"
     ], 
     [
-        "7pejnWw1qHjCfAmzXoStxFZYMJ6hu1gixoJD8irtyrki5A9PHDWV798YMaH3teBadyatmdV2YvT"
+        "BkH33ufjLbKPVFTrzuTYqApMKSJ3imQsWbKAZeQzrV1WMcN8qMgYJAFSxTtWnvjCafDVB54d8M6"
     ], 
     [
-        "4Yi2yBokcAj6acLZhiNwmmA1DSzuKnz8vfJ1FHE2yJLSTab6FUi"
+        "ESKniHom1MMJU4CTbL6QUXc3533afZtnFq"
     ], 
     [
-        "2U65F6JTxDP2YJ5XV6FiYxpWMCjwCRbEN9ygEXZ3KkbLUMjSbvKbPyCMLf6ke9kMPg9CLQcJ7aN9"
+        "s46MQhCaM6fuCfjSDUS9NsErpCMDabcUJjzfDx3A22syyboUyJ53X2TAXvq77pqpuL6qoRi1SPd"
     ], 
     [
-        "7UgNNEAfdinxDG38ByGmVwbRJp7b4q8BEznm2GXbSJFVSTyS3jiByNLU8ckDprYkqvi5bcf61SUkw"
+        "yMptUgd9CHbxa7HdCwNbVPUdcmAfWags6LZ2vN3tVrKkFwaqXLyvUjURHYMecduwC8Zg3w8VT4S"
     ], 
     [
-        "6wzMif8TRzrnyQYAbRZShWcZo3dqKYkBVpi2JR15DFMCLzxAkVTUpsuwdTUWnkx9j1kGDyukh1Go"
+        "cUvzeywamGPgZeTEvKyb13KWrMtHW3uP5A"
     ], 
     [
-        "6YKZfgYJSh9ivzFX1oNqTiiWwhCGrZbnDCigU6N5oyiBeVUKio5ww3Zu4N6K6NHsqaR8djSh9dLfX"
+        "Bz4wKUZZuvMCuJQQ5fk3S8J9f9vYToXLCQiJM9gh8sqqYtR4ih7BcN4piY994dNRzgprChyqorh"
     ], 
     [
-        "92sWK7QesAPWS12srisHmc9q8Fz8Z5ERJcAaVwkjVKENJmL45bBM"
+        "5eamdCBbGzfoLqzWeKfRiWSHt9kEhpHBh6NiEa9LMz3dCpmUayA"
     ], 
     [
-        "2Ua8heeYCTTsr5qgi7vorTpDAWVRGRAJKZ7"
+        "6KPEfpBpiA6Dm76Jho27HQvUH7Zgs1JBnhXoA3TNDQKiFbfGFhS"
     ], 
     [
-        "2A6BvvmZ86GG7TRwXyCaCvhiM5FsVFvs42x"
+        "4RniMnXRQQdFnB4L7uGaS6s626ggDPgDmh"
     ], 
     [
-        "R5uiBq2rzVGhxDsq3MeGU3QKeZz8wLywaB"
+        "MmBNHjuFBf3hYFc86C8CbpvhQxUmJ3s9uNq7yBj1DGNQBftjMhFL"
     ], 
     [
-        "279AcBMDWxh5hnfEm5kptwnfn7rEWschhdxkEzLYzEj2K3wSHfEaqV2moec6wP5w3jVy5cFhoVXk"
+        "TRJ5AimLiMHgjXtk5Kb3t5gFuCADCCpRDd"
     ], 
     [
-        "7VMRsPVwoj7vZATKQGj2yVEX55f2qNKDxNiw7YNJv1zjfFFzyWR1WS67tefp7fV1MpXrUhNh86e8Y"
+        "2FvYQs1UHcMok8Zkw5aQvye6aKUgPNiUxUC74xSq1fFN9AZUGCVjLQcCbrARbBW6LrZdra6Pqe2Q"
     ], 
     [
-        "2V95nNKY2YtDuxyQ6K4unrkKQTmhRpVcUiXdYKxfJSrQG22tHmNojaXc5gUy1ZY6cAByCBMZZsas"
+        "s2PouXimnrXwdBnx7mrHGvUaYUAeWJmRdtLTgMDTEL8sSM3Zm5K5mt1YaFN3gZkcTXQ2PHbMwGD"
     ], 
     [
-        "2D79xmaAZxTf2fMRsTGgkNfMrUErj5CqXNY"
+        "5Jdte5oiW1S2WYNCnFespcKHtgVMAtNPQik3sx9ASnjeVPQwy5qadBcECrFuvrwWXuVkNZy6ghNp9"
     ], 
     [
-        "7nwQ595A7nXdySFQ2pHx71xJsVLhJAeoj68MSSDHhPMxhBQDynYa5KDXEfhW8jZdZeAkraFMy7b"
+        "BuVc3GVziVfjSD2FEEzBdEcvbfJhVjHrs4bKvaUd5b3bH1sBNLbnHmvsFirBcH2JSyYBwck247o"
     ], 
     [
-        "7rLMRn8VSmsGV1QUfZf5xro5gejEST4fuXpokKSvqPPX8wmMabe"
+        "28toEk7TcnBafUyg7p5Kb48dSA5k936JfvJ"
     ], 
     [
-        "J3JtSQiZ46yXNEXpuzjmA7R366BBKMD7id5PZ7cX3V5K5DcP3M9L"
+        "BgoXxd16h5kNkUPUPrYr6JPqsUE8nwweWid1wHjjQysvK4M4oZA5F4ZF7oACd4fJk1BUkLpZiSu"
     ], 
     [
-        "21WFTGZEpLyGHqVmb7a5skPDN5oD7ocR7r6t2osiqDQf6Xa84mkh3odE1cbZ2ocTFMZbHSrLXyJr"
+        "rxxJQLtYt2EEo2EHndEKBNdftVXjfZGz5qMJ5pE7mSz7QfuoVBipgUzzke1xM6p5Fq1gDUbERak"
     ], 
     [
-        "7oShSMyZqoK69tWvUEwLBGWHzZFvuVV5SESa4rBe3TmNzfJXBJBP528XMMMiQxoX7fSAzhF2bYL"
+        "4oL1XytXT1vFYrcQGhMDsZnLayd4zDFfLpDK45bLMvKfPpkx7HfBwCgavru6ZanDn2HhajRvWZvbi"
     ], 
     [
-        "KqarYQ2A4jimBefL5i1SRpbz8xn3y3P2UX1tafCgf48LXTDrKCcf"
+        "4v3TDmVnUXauY4gbJrJ24st5DNppC1bhvazKviAqbJqQzBoM4wkJzEbHKME4UqfzimQHnXZdu7o"
     ], 
     [
-        "gSzq4StFrs2i8gTZ84pw9x68aPQ3XFe5b3oK669aSd68yfFmxH"
+        "2NrA1BB5WYL7hc8mnsHDYfGgWnKiUqxPAKRKTtaPKQLyMvqeyw22eeg3kUgV3FbgETYHUMfdxQiM"
     ], 
     [
-        "7UdhV95GSa6CY2XjVYfrqrwwyCScmeksu6TCqcpRSeeMbEmDydSMB4E2CCHFZ4gLoXXB7z1iWsGws"
+        "4pPdJ8D3ZHVWJBDchtRAMKt6rcoZYuns7Tq63Q2B5YP46KFygF7fujLsyXGdcSGjKFPsfXeidDxhG"
     ], 
     [
-        "2msvzdVt86YVXqkWQBJG136u11REi8cXpn1"
+        "yJzfFRzU2VDvwKgUWYbFLBrYn17iaGWKbjuPS9QbuCgrq1DmrNdYHjsPHf1donaqku7HimZ8GvH"
     ], 
     [
-        "ryMiy7TSV4LfnJWeXdvT9sZgiLj6ebNg2ac6eLdSAE1N66u1SHwASam7njVBMLYuzr8ntySNoUT"
+        "Bkq1jyBYEcW2pg27hqrwF91AwEHh347SHHH3E6EizgG46gxhNitHZc4fw2rKfhSZLjPCKnJqG7i"
     ], 
     [
-        "6YnxQpwLv2PWVRw8cf5JVm1HmLP3UrQyyUMufDLzuYRg1vbut9he27XAzmLp7m4WxTz7vsriEwQcX"
+        "rrXc63Cb7HavEWMGejpK4Wf5QwwFLgMv1J4ADjgp4ZExRqnYKLXyjwGfPiYTE838N4wkD9oMVrB"
     ], 
     [
-        "92g6icyL3H2XCqLiukqquX15fwBR5kFE744En5cd3X61cpANrjqY"
+        "WvrhwrCW1v5xPViwJ3M4z39PAkggxfNe8as6PifC8nbV5icarfsK"
     ], 
     [
-        "2XCxe9EpeGVMkfZqFgtAKmU2GNBpwnmukDs"
+        "QRnJ87h6RYP7phr4W61mwq6mzfMaRDWpuCVL1NL1ZSQAgaUuXGQL"
     ], 
     [
-        "6YdrW3VDyE96kBFvKghrZ6fkwVngGgJybFnrFHXfexSorcQPxzbHLqNWTSMZHkrdmeQ2ZsLCnFhe3"
+        "D8im9DxLrJ5CjxqDeo2WcbtUYjZEx6svs32"
     ], 
     [
-        "PsfkAxuhDQKQCwvuwfiVo1vdcYc4fLLr7oZ98XrMyp7SAsLAyQorF"
+        "DsRvp29V2ZKtbGAqiqumCi2GkmS78iQo7R"
     ], 
     [
-        "2k2HeazZ1apwsF3VQHHCbooreJ2anjumTTU"
+        "PXyMUAdRUFnZv8XqMj5CdyQnrbKSsk7roUfc2fdGnonjnRkhMu6UrU3p9hr3S4j7AtD5XbQkJaQ"
     ], 
     [
-        "724Fw3TFoSoXsZK77FC8NfrgN2scVC8pq7SntoNgCY3oosmEZHJLcrZVKiFagFm5TLcbfuhKm8ewM"
+        "6wwXq5Z6TRjeGjdrwKbRxGF3Jx3PWDBrUiv6Km9KuV3vWQf9dpY"
     ], 
     [
-        "7VrbcSqCJndcp187BT68T5eLXF3TQaH7vN57nAhNhbCyUjtvuX6rtDJYNLmXhPTSrE5dkWqifSsRG"
+        "2VnaiFvdsT4NehL33PDHby59fhp7USk9eAz"
     ], 
     [
-        "8SHxzARcUKM6NdLyM4JDSMoSkA99SgZ3zP85JAEaiipxnUXuMBtV7dtx6cN1wP5df4bQ8G6MsMv"
+        "2McDY8jPS6QDXBudMqXKagN83t9KyW4M5zb"
     ]
 ]
diff --git a/src/test/data/base58_keys_valid.json b/src/test/data/base58_keys_valid.json
index bd87707a25..2e52e8209a 100755
--- a/src/test/data/base58_keys_valid.json
+++ b/src/test/data/base58_keys_valid.json
@@ -1,7 +1,7 @@
 [
     [
-        "XtLoNJ2NpPbxYsFYFHewTy6QJQCcvziDAx",
-        "c1a7e32962dee960126497b3df1fd4072c93f503",
+        "DSrCprAB4f11CwJisjXY4tZnUBf6CWXzN6",
+        "ee20f17625cfc91ad550cffe31e326ed54742e99",
         {
             "addrType": "pubkey",
             "isPrivkey": false,
@@ -9,8 +9,8 @@
         }
     ],
     [
-        "7iRPy8FEHBzbChrktsG85YbDZ3SuiCxsNq",
-        "afa615ddffcfc364f952956c251bce5042e821bf",
+        "5FgqnBzmbdZTfRiSsGqdtuNKpbAM4Ehumz",
+        "91f7e25384a616a6991c039b4392c02c452f9aeb",
         {
             "addrType": "script",
             "isPrivkey": false,
@@ -18,8 +18,8 @@
         }
     ],
     [
-        "yjPCQXXeWJLFQWM6kF6dKRczZbNkSWVtrj",
-        "fd00802f8b61ccf0c1bb1c7969c832673ed546a9",
+        "DLNALYk9zTpCzg8bA462ec5dJG7mVgpCSB",
+        "a70276fa05a702e50c31f461e8e82907cad90001",
         {
             "addrType": "pubkey",
             "isPrivkey": false,
@@ -27,8 +27,8 @@
         }
     ],
     [
-        "8yDrsN8yRfbG678S5eVntDtAHdnuQKmCDx",
-        "ce38bb4d79dd633ba5fbc0ea1e3b85a637acdf59",
+        "55J1XXjCC1PVpZErbNV2hPUHAihDgXVhPb",
+        "1ff5321a959919d160d1b919ced7e891fe7d9735",
         {
             "addrType": "script",
             "isPrivkey": false,
@@ -36,8 +36,8 @@
         }
     ],
     [
-        "7rJYzFcK4nNu4oEFUZL9heG4u4XNvoXdkiCaddtQZ8oT4wMxPta",
-        "6333e256bb02f09b3bb233c17c5e86562cc39571ac2eba07a92d99d1f6faeeac",
+        "5hh32GdpNZfVBEMac4NEJyw9PwmcopftWqJWWxNv2DNnzPTbgSY",
+        "483df1fb4f064e05ec6eaa8558c119b8adb46703e26a1c8e55bdb7c45a45e62e",
         {
             "isCompressed": false,
             "isPrivkey": true,
@@ -45,8 +45,8 @@
         }
     ],
     [
-        "XGCaeDGqsxPK93JHP3kJ41MEAobFu42PXkASRLXBkCx3bKBkrGMn",
-        "9296962c50327a60f78a11b6f017ea3b22182892fba9c976a765c5b014f25802",
+        "Moj2SW6qhuWiBUKhacY1F7VNKTHRR8bet3GxuKyETxr7dMLkrKSc",
+        "a584faec3d9b97d6b43759c10563827adaa03f6d087525489eb60f91501a9f04",
         {
             "isCompressed": true,
             "isPrivkey": true,
@@ -54,8 +54,8 @@
         }
     ],
     [
-        "93VwggWoGhj1pLaEhNQqu1GSbGTTESiXtZsFrfxJ67tPgHGVoLM",
-        "fc1941692fd7d26625aad4d7f5e0c15cc45ae1a3d6aa07fab903f5f64508374d",
+        "6KtQkzQrxVD1i2uPia5DgUWorHaBaM3ZPcLj1WX13TXRxVCs4pn",
+        "e72113c20c112b2791bc72a11e935a3b93f3985d930ce8ebbba393350f6967db",
         {
             "isCompressed": false,
             "isPrivkey": true,
@@ -63,8 +63,8 @@
         }
     ],
     [
-        "cNddBPFJ6PbCX2BJVR6up2p8PjtFyUy7zpbkAgRGhMmrPbCe8Fvf",
-        "1f5750a1f5703e8b1a273964c7b7fce1871cc7a43f303ec7d33ac724fdb59eca",
+        "QUXvYbfyhfvHduoy1byH6SVkyXK91VUYyUgGYRH6jL7dzE6t3vLx",
+        "b09ad5be029e04e0cf24eef4b78b3e24d7992c9588150120e1329b7c0edde7e7",
         {
             "isCompressed": true,
             "isPrivkey": true,
@@ -72,8 +72,8 @@
         }
     ],
     [
-        "XigZoHdsPg8qHTxUwyZFttzp8ocSUwLKv9",
-        "57b39f318f3cd120e08a5f710850c03c22c213fc",
+        "D5PfDQPWHALkPjQp189u4EgkuzkXptWTzH",
+        "02c1195fd2c8b787ccbed9f962ec808bf1eb5125",
         {
             "addrType": "pubkey",
             "isPrivkey": false,
@@ -81,8 +81,8 @@
         }
     ],
     [
-        "7qX4wLps8eQEc8vVNxodyowpJtM8NQjt4s",
-        "fd81935b46055357fd1d2af1ca12ef055f9b0cc0",
+        "5MqE6tGeRF5eBrNKs3uiZmwzcVowVjYvH3",
+        "d55e99a7b9da8386e155891933ffb078115197d6",
         {
             "addrType": "script",
             "isPrivkey": false,
@@ -90,8 +90,8 @@
         }
     ],
     [
-        "yT9LnoTWwW8BZfMsaBzb2MeYPW9rJXrjcn",
-        "4adfa9d287098715d3d8be30157a83c14f3f01e9",
+        "DBVgSiKkR5gd7f6zf64eR4JXQ1iUqKaYAP",
+        "45b5603b0fdcb62a6f953eb14efc7a4a7e16161b",
         {
             "addrType": "pubkey",
             "isPrivkey": false,
@@ -99,8 +99,8 @@
         }
     ],
     [
-        "8kPTvJRz23wKti61gMrsi2vJgs7q27A1gm",
-        "41701951c4acaf87123358d268e84c066b054782",
+        "5PGp6CXh2a7WEQBQTLEMsQmGDpj1nkU1a2",
+        "e52d7f3855aa854e2f5dd7281a6421b9604adaaa",
         {
             "addrType": "script",
             "isPrivkey": false,
@@ -108,8 +108,8 @@
         }
     ],
     [
-        "7rdDu7XRm5WLKmPaX62vqVLaQmPtYT18tbk2i7fY6eRnYBrsrJZ",
-        "8d98e24f45c472b2a04390fa80acc09ce2ce7d1ce041489fe5d9e8d89bdf6b2d",
+        "5h9NM2YJhDXv2ti18CsQMQtKBBAbUtL7ENtHGd7gC1VrQd9pzLU",
+        "0056aad246014504b490b7d250a32018722f608523bb57f29d391fcde2ad8753",
         {
             "isCompressed": false,
             "isPrivkey": true,
@@ -117,8 +117,8 @@
         }
     ],
     [
-        "XHNgkfosQamJ6M4bptMJPAMpqdeRj5mh3DWRy7fmhYcBRhHez15H",
-        "b59fcc3195c2d5e3ccb19956b0d513154cff959ec3acf9bb6004670d728fee56",
+        "Mj79no693F2UQeSGU6CyBx4Ykzy9Vct7xvcWheTnNLfnK6GsJcgK",
+        "1bb71d8c10cd9c805f9a2edccbf796debd699cc90d426b777f0721b0ec80390d",
         {
             "isCompressed": true,
             "isPrivkey": true,
@@ -126,8 +126,8 @@
         }
     ],
     [
-        "93WCLruvEegkBVYc74utyt8xvt4TxunX1kHryCQtc3RCJ724Uuq",
-        "fcac2955e7b3e3c28a1e069b177089574defb34741e9079a977e760fb36cdec6",
+        "6K2iCJY3gkdrt1t9U6hurxE6F48eXbyum4zYB1t18fzx6r6DNUt",
+        "7647dc31e18a57a2107f89550b6e9378ae3486c30bdd22b4be5a1ea38a1925c5",
         {
             "isCompressed": false,
             "isPrivkey": true,
@@ -135,8 +135,8 @@
         }
     ],
     [
-        "cQqbUpKkaBKG1TAyXFh6xGKEfQMZChtu6Tv1NsZMHHwTXja6QnWv",
-        "612c8e6ef60e6d036e4cde5882e55978c84b08825a246098f1e8bf1e068f43a4",
+        "QRrBxfXBNR79FDVzxheC4cf6XwXAx2MF7NZdvpBLELEegAfQ9Mvz",
+        "607d3edd2018ee169c85026e7b4cf7fc79bd49c4a756fa59f8bf94cdc5d6a50c",
         {
             "isCompressed": true,
             "isPrivkey": true,
@@ -144,8 +144,8 @@
         }
     ],
     [
-        "XkMbn4X26GbXrb5U8t1dP2miqvwJCqk6XD",
-        "6a0d9f3c2bcbf03ceba283fe3feeaf8eb92f7acc",
+        "D9ZVr48U5e4YnJQV8bspLzGBg9WvyUVwmN",
+        "307df118a98b1030ffe2e25aaf93a53b2bb2f57d",
         {
             "addrType": "pubkey",
             "isPrivkey": false,
@@ -153,8 +153,8 @@
         }
     ],
     [
-        "7bNrQPXbcGnbe3K2dUnQD9bXawugSgX8cX",
-        "6262063c2a4a0a638062aaff356d79c35600a821",
+        "555PSxTuA9PmfTXc9vNFrJRp7XE4sthoGd",
+        "1d921649faabcd89683c3e1bc305136708ffeeba",
         {
             "addrType": "script",
             "isPrivkey": false,
@@ -162,8 +162,8 @@
         }
     ],
     [
-        "yXU6wzQ9mU8VmSppe4BLTJ6wuCgeAddPkG",
-        "7a4c83f2194c3d4b8d2557659807e31fe549e1f3",
+        "DCKMCU32Kg56wi473Vyt13t1oyQNAiZqse",
+        "4eb946d105f079d518f025352441fe323c468735",
         {
             "addrType": "pubkey",
             "isPrivkey": false,
@@ -171,8 +171,8 @@
         }
     ],
     [
-        "8kvSTstYGkxogEXxJ3ALCD4bwMSnVV2uR8",
-        "474bc756e41243d2864aa4aae4e962edb3b4b514",
+        "55adr1jHQyf6uCxYiX4Du55ivxF2P3sUbD",
+        "231a2b1c9124c51d60f54007a46f915423662971",
         {
             "addrType": "script",
             "isPrivkey": false,
@@ -180,8 +180,8 @@
         }
     ],
     [
-        "7s4u8NofVVzDz4uz3FELHRSLccn9G6AaTpnkEUeRCHmmaFeysZE",
-        "c7e604df1cca9e700fd023b42495902d1c8eca2642df42543451b3124d9c7279",
+        "5honG7H2BbQmsEePh8HxGzWAr4WXiHXn4LV1cikWy9xQkqF87H4",
+        "578ef5f99bb6d4669b1ba1b458271d2074d5868b1b18951446d8d8f69fc2359c",
         {
             "isCompressed": false,
             "isPrivkey": true,
@@ -189,8 +189,8 @@
         }
     ],
     [
-        "XEPuZVWCUjRFeoW9hKg4DB9QsZhqojT9uqFt3Mu2UVc61GkRwWdH",
-        "5cbd7421d9fbe6b3bc5b684da2054091da8a64b2a3ad25ab7960d452fd05b3ff",
+        "MpYRMBuDD99WVET2MJvTdUBigfs2Nf89Q9LjKFHf3gq4v6k4xDGN",
+        "bde6b682bf5379f02b1e6c1aec27a088e5edcfba66ed5be59abdd2f6a13d23eb",
         {
             "isCompressed": true,
             "isPrivkey": true,
@@ -198,8 +198,8 @@
         }
     ],
     [
-        "92bAGbFfnYyk78iHJ7PdhV7TsJe2scVFpQ3BjWkrcfBEFBQGefV",
-        "843f9361a729052d69193c9f47b09383416881f68188bd1139fee97bc6ec7d92",
+        "6KEvqsFQLg71wfecqUxs2SptppTPsSDkj2T3yW1Syk6Tspw3HuK",
+        "9205f7ac1a16dcecd187b79fef5f7d3a5b6af3760c778cbd46c6e4fa770b6263",
         {
             "isCompressed": false,
             "isPrivkey": true,
@@ -207,8 +207,8 @@
         }
     ],
     [
-        "cRFHttGojDviBmDokZys6C2RHYrtwiyyWtcQmT7gWSeRbFQY4e49",
-        "6d5d556d5843e6c550b83f4a33be4dd3bdd5d143c07052a0cdf1f1b351d9cd2f",
+        "QWJVZSTDLi7M1xKFpKVLs5bZGhSmx1m4sRgcM57rbF8xzaPJApde",
+        "e55eccd45896cee7c3e42b2af6b7bba3483effd29546c70184179bf15dd95a98",
         {
             "isCompressed": true,
             "isPrivkey": true,
@@ -216,8 +216,8 @@
         }
     ],
     [
-        "XdsK6sSz3L4zLJCdyPRukR6AR2LythNSqi",
-        "22e34cda0ba9e2affb620720ae8a7797567da639",
+        "D8jsTorPURv8RFVbqN5C6AXiar9qgcyWGc",
+        "277c05265e2a95a9e4f759de11327274c72f4df7",
         {
             "addrType": "pubkey",
             "isPrivkey": false,
@@ -225,8 +225,8 @@
         }
     ],
     [
-        "7bofzFHNeodW6iJGv6bzkejVHDE12DPXm1",
-        "6713ba75a430dc678a402012a8fdc40fcf3c2ba5",
+        "56HRA28HV83nvSK1A9gAcQf6b13PBMZykU",
+        "2ad0a1513af4f7df5ec3bc1c202364ae4d915af7",
         {
             "addrType": "script",
             "isPrivkey": false,
@@ -234,8 +234,8 @@
         }
     ],
     [
-        "ybtBPfTFkCUWFBzGmGnDQgyfWB5N74LBwC",
-        "aabab5cd40c1cc70d254e8616bf75edc2eaf4bc1",
+        "DJ6iW4FYLnVdQ12fFVNJV1v93bu3bbpoEG",
+        "8e26682ae3d521514c8ddc9e5dd05d326c917d0e",
         {
             "addrType": "pubkey",
             "isPrivkey": false,
@@ -243,8 +243,8 @@
         }
     ],
     [
-        "8oDjDp3wqAdWLEuT4LXPo7N8ZHWoJLdMU8",
-        "6081170c074531062628484693ed4e97b3963670",
+        "5NoQg5xFLnawT9UnKqhQSJQvdy8kgWvZUd",
+        "dffeb831573a843075aa9b9f51be11e55b70a415",
         {
             "addrType": "script",
             "isPrivkey": false,
@@ -252,8 +252,8 @@
         }
     ],
     [
-        "7r5ffXenTyRA9rXf3Mgji4fh33AFYuMm8eSaKpRMnimgQV1Z4KV",
-        "45f22c0ff5e0f588f710377c9c940ca11bfa920a2b5cc5ff4b6f115e8d2bc2d1",
+        "5hWZCeFKYD6DdNwFXEfCvvam3ZN2j66C8pHP49SHze9vhzNHyjH",
+        "307253a8d2fb46948ad46d86128acaf6d8631879ca8e1375f60b2ca65fddf379",
         {
             "isCompressed": false,
             "isPrivkey": true,
@@ -261,8 +261,8 @@
         }
     ],
     [
-        "XGYzT6mPs7L9z9S6Ryn8og8excfLtH7J5easZjDWH2kWfRBmoAgR",
-        "9d16918481c74120a5b60b684ac94a08ee341f1788575548b8c45098a88a9c29",
+        "MixQNm1ET1k2Htgw6R64xfntyrKMH5naTZUBuSNPRTA8JLqdeYmg",
+        "1736f80b301770e4fa92e13da63aef0d02e785c7ad5bfc231793bee85d3c241f",
         {
             "isCompressed": true,
             "isPrivkey": true,
@@ -270,8 +270,8 @@
         }
     ],
     [
-        "92j6ZafQ1DvMkuWvnY5FQdudW1WZGJQh8sPpoK6PEeoEfU7YLnv",
-        "9644a862c6e9e5d99c169e7bb7654bda044f2013ae3d46aa2b7d1b9c695109d8",
+        "6JjmKsD8UDZJtRpHS4noPzU8KCjk9F7GZBNTQWK1Ww27eFoTQdZ",
+        "4fcd7c1cd7e33a8e1c32cd8e3acd1ed074a106aebbf392ec49afcd86101e0d84",
         {
             "isCompressed": false,
             "isPrivkey": true,
@@ -279,8 +279,8 @@
         }
     ],
     [
-        "cSs1wg2Lm9AvQp8diEdfTp4kaaYpLm6GzFD3sxtCLkU2SJiD4qqk",
-        "9d948bbecb677f6fcba65d78964252e5892a491351ce1b6d0a69c5678de330fe",
+        "QP3VFfzZfJGcPKiwHmi7ZBiKZNHDVirFQPdRzr3RTMCXvXJAAmQo",
+        "0cca0c6742c8c3b94c2463eca6657372965737d4eeeb3387e33aa7dfe93cb94f",
         {
             "isCompressed": true,
             "isPrivkey": true,
@@ -288,8 +288,8 @@
         }
     ],
     [
-        "XjmoGTCeDNDCGY6A4ed6d3VBdJmdsj17EJ",
-        "63a911fcd13311d90188b372b6f8ab7a853ef052",
+        "DTs5VfyAR1YGkApcaM9o17kcbpz7mERjrE",
+        "f9435d9c3acc95729ccc0f61fd8e08b784e61d96",
         {
             "addrType": "pubkey",
             "isPrivkey": false,
@@ -297,8 +297,8 @@
         }
     ],
     [
-        "7gtFVBDLHVg4AVBJpneR9fNr9SyEZKaeic",
-        "9ec9fc088ce0a02386c787227e699e50256edbae",
+        "5NY6ECDSWDPK2VpnLoVVK3qnWJuWFcFTeX",
+        "dd1914efd85f6fd06417ffc57bde5e7f184e1936",
         {
             "addrType": "script",
             "isPrivkey": false,
@@ -306,8 +306,8 @@
         }
     ],
     [
-        "yd3pNG9y4V2R3wkjfzH5kvx3ULab6y6wf6",
-        "b785720a94fd55e6f1c738fc465918bdd4280464",
+        "DRRJotEM6tjpmJnv9NM2NHjB5eoThDrseh",
+        "de7369bda6314ba66eea41d6d7962e10f1742d7c",
         {
             "addrType": "pubkey",
             "isPrivkey": false,
@@ -315,8 +315,8 @@
         }
     ],
     [
-        "8f3s8CPyf3fWEzsRo63SRzeJYVkVtqUHC4",
-        "06e2857a0b00f890ff8d8a5cd43efebbdf48214c",
+        "5QQGuRKsUvBuwwBGsds4WKKQgwnLaq8j65",
+        "f18eeaf4883eb7f60be89bb733f0bc26db875a80",
         {
             "addrType": "script",
             "isPrivkey": false,
@@ -324,8 +324,8 @@
         }
     ],
     [
-        "7rz61M9gL9gtoZWJBbF2m34ajNfAaPmJrRyCBxuSn6D2VFETrfE",
-        "bcf8a68ca0454f7a356a9c3e30d8f25ae30d9218a58861bea11b4ccfbdce83fa",
+        "5iPn8pLjjrvHeeVVHjGRqqs4xWPymNwXk3afQpdF3AaNLJEV8Jm",
+        "a4c13296bb23a87ae6401bc0c6f9cb90873dc9236ca40e43b0c4a02f9de6871b",
         {
             "isCompressed": false,
             "isPrivkey": true,
@@ -333,8 +333,8 @@
         }
     ],
     [
-        "XJ6a2G4a1ieDujR12rZy5T3tcRmNj5AfBmEw7jJrrT7XxBbjcWc5",
-        "cb2bbfe7aba4c95555da06409432cae7fd3a7ff59471c0e33744c27d49729340",
+        "MopRGX92wTnhmY2yWrUins255WFnivDWMFDWbnzThngrBxm2Nrow",
+        "a84b4b4ed0dba910b9451bd6fb1f9be80e56ced5f3361d8cf1627eebb5304402",
         {
             "isCompressed": true,
             "isPrivkey": true,
@@ -342,8 +342,8 @@
         }
     ],
     [
-        "91czfGPDq43RjAAcMFJh8kRqiEA5apW3R1S5xYY44EgUyNUFAPn",
-        "04b7a1a49323625e107fa24634de2d41ddb693320fb3aabfd471b6ccc2120af2",
+        "6KYaNRJD3ApsuLQmRE16cgPUCoPA8FDbxAuwpp6bUmPg3Khdgcx",
+        "ba17cfb019b8a0c545d6be25b2ac2bf79047ba52ffb0835d8fa6b4bccd37d8dc",
         {
             "isCompressed": false,
             "isPrivkey": true,
@@ -351,8 +351,8 @@
         }
     ],
     [
-        "cULWxgtMoehad4qqafyxrd5nEgtriXbFwQNc9MYFFWj16yagKxfB",
-        "c9909a0cf712be81d4f88526658f1fb46333439fd2ec2e58ceb9f469ee69b303",
+        "QQacisvKRDvpfVNKFTUEN4A5qgztiZNL5BD9Y2fFM38ZNicCWix7",
+        "3aa3f5d9c71d9cc1ff77637e9ae55edb02d90957cf5a1a903ba850761079f54c",
         {
             "isCompressed": true,
             "isPrivkey": true,
@@ -360,8 +360,8 @@
         }
     ],
     [
-        "XuuUgm1e17hRV9pUKDzf1Xf6pBA35XaNsJ",
-        "d2ce252de1e1dd9d1205a9672b274f488d943c92",
+        "D9SvgtNdwtfi8j8BkPicgyZVa921Hnhn5z",
+        "2f3fc45d2ede5fae3a8ee972009adf8f5e947107",
         {
             "addrType": "pubkey",
             "isPrivkey": false,
@@ -369,8 +369,8 @@
         }
     ],
     [
-        "7gG3an3hmKQasE36RWzhfhnpy5y6M5zZaP",
-        "97f112c9c50ac814a953202f485eedfd2cf856b5",
+        "57UegHTpyqV4S2eBHqgt6c1ahU1P9NYjYH",
+        "37e89e72d731a1af69c882bc97d25e797d4ebd72",
         {
             "addrType": "script",
             "isPrivkey": false,
@@ -378,8 +378,8 @@
         }
     ],
     [
-        "ya2zvp6VqHwHuNzRYfVKScpFwAEaiVfwrb",
-        "967577dd6bb09cd009d81be910b37ead7ad31e1a",
+        "D65anpY2pX3ZApDjVewRiWNjwbVyZ5yoXQ",
+        "0a4e0b741ebf7541fa15225e6d41da281642c7eb",
         {
             "addrType": "pubkey",
             "isPrivkey": false,
@@ -387,8 +387,8 @@
         }
     ],
     [
-        "8qYkoymbuRbcZPfSVw98jQG9Te3333o25Q",
-        "7a0a9245e83625c635c9b1db175338d2e22e1976",
+        "5NKLoPrRMzLmh8HfdJXfZfJ6EvbdFb6pca",
+        "daafd6b6f5d6a21e53a59002cfa85b061101cd03",
         {
             "addrType": "script",
             "isPrivkey": false,
@@ -396,8 +396,8 @@
         }
     ],
     [
-        "7rLo1znMUU7gZQy66JvrHkvozumpxWVDqcVvENUnKDyoGG7G7Fv",
-        "684b0d908dfa54a9a9ea86f0b95b8a570ffe6c705b21c98f8753f0e152234cc7",
+        "5h9gLa62tV7TM4DQAp8t3PWNA4tKhDqbNJ4i7i3mSuS67pZKTts",
+        "010afc492d3bcfd8233d8a135dd95ea2696fe7bc9862c728b40a8c4655efacf9",
         {
             "isCompressed": false,
             "isPrivkey": true,
@@ -405,8 +405,8 @@
         }
     ],
     [
-        "XKWfDoYj2WAHFohAkN1usLZ7qp7pTDJrSZZq6mygDwcYfXufZUcW",
-        "f566a26ae4e40f6dc430c8b554fa9f9a9dcb2241c5d6e91bd6974b8efbd13604",
+        "Mj9dbi9vQRpWLKxSZ4cnUiidKYzYPKK7DH22sKc1LkHo1292VuNn",
+        "1cfda6ac698032ab9f04ed904f99c83d7cf0621f70e22e7b924a6287a6a30924",
         {
             "isCompressed": true,
             "isPrivkey": true,
@@ -414,8 +414,8 @@
         }
     ],
     [
-        "924PDowxE6eFweoqHp1wJbPhmmtw4wQWLNXf9PSgGUpRS2Qb45S",
-        "3e5db91a1ddfc8ddd7b70c1f42dd17956a134da974a69ac49b86ec6dff40c6c1",
+        "6KtwwL7SoNYNwETf2KqkKCYyrAZ7pnzJQVieJC9LLTordgHji2d",
+        "e8598c2e68b6a545249fae361bee648b9de67512900c3db62d1eb8c606d032e3",
         {
             "isCompressed": false,
             "isPrivkey": true,
@@ -423,8 +423,8 @@
         }
     ],
     [
-        "cNACCSjtqhYrLCdoFjfPUULdhPjhsA5GfgoqZHomWCUCpM9FMeJj",
-        "113acbdd52394bce786759896bc0c856bb8250f73dbc534dbc4abb7e9ff67307",
+        "QQUNvANWT5jHn9dMEndmcrVa9fnqkjYCBy22mtmstea1ZTnW71DZ",
+        "376e6fd2bdbe60e98b1929a195c933cf1e42c1c97d46596964f509b26b4f7285",
         {
             "isCompressed": true,
             "isPrivkey": true,
@@ -432,8 +432,8 @@
         }
     ],
     [
-        "XetExvaUvtrzqUaMgXBzxa4ZZsebdzGxha",
-        "2e0863783ae131b41bcac197738de589881a59c9",
+        "D5x3eq9RzmbyiWUgZmxXEPqKb3DKDUPLGc",
+        "08e123f95c293e5b6cb41feb15fbf7bebe02ff61",
         {
             "addrType": "pubkey",
             "isPrivkey": false,
@@ -441,8 +441,8 @@
         }
     ],
     [
-        "7mkzXHgVaVqFF8bvKVpRrL6LeS6tLPBHw8",
-        "d44335f13c8d26c9ba5106b2d4f179ed5a650286",
+        "5PfVmf1GWU4HUD9qUGumBHz9pSaAebS9xx",
+        "e977c58405705e448292239c9bebdd7b332282c9",
         {
             "addrType": "script",
             "isPrivkey": false,
diff --git a/src/test/dht_data_tests.cpp b/src/test/dht_data_tests.cpp
index 7e9c8f29ba..7d2d848ff3 100644
--- a/src/test/dht_data_tests.cpp
+++ b/src/test/dht_data_tests.cpp
@@ -45,8 +45,6 @@ BOOST_AUTO_TEST_CASE(dht_data_test1)
     std::vector<std::vector<unsigned char>> vvchPubKeys;
     std::vector<unsigned char> vchValue = vchFromString("GET /authorize?response_type=code&client_id=s6BhdRkqt3&state=xyz &redirect_uri=https%3A%2F%2Fclient%2Eexample%2Ecom%2Fcb HTTP/1.1"); //= vchFromValue(); //?????
 
-    std::cout << "Enter: dht_data_tests\n";
-
     vvchPubKeys.push_back(key.GetPubKeyBytes()); //add public keys for key1
     vvchPubKeys.push_back(key2.GetPubKeyBytes()); //add public keys for key2
 
@@ -63,9 +61,6 @@ BOOST_AUTO_TEST_CASE(dht_data_test1)
     BOOST_CHECK(DataRecord.Value() == getRecord.Value()); //compare value using key1 to original value
     BOOST_CHECK(DataRecord.Value() == getRecord2.Value()); //compare value using key2 to original value
     BOOST_CHECK((DataRecord.Value() == getRecord3.Value()) == false); //compare value using key3 to original value. expect this to be false
-
-    std::cout << "Exit: dht_data_tests\n";
-
 }
 
 BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
diff --git a/src/test/dht_key_tests.cpp b/src/test/dht_key_tests.cpp
index 40d84ce699..c108d20dc3 100644
--- a/src/test/dht_key_tests.cpp
+++ b/src/test/dht_key_tests.cpp
@@ -34,7 +34,6 @@ BOOST_AUTO_TEST_CASE(dht_key_getlinksharedpubkey_test)
     std::vector<unsigned char> vchSharedPubKey1 = GetLinkSharedPubKey(dhtKey1, dhtKey2.GetPubKey());
     std::vector<unsigned char> vchSharedPubKey2 = GetLinkSharedPubKey(dhtKey2, dhtKey1.GetPubKey());
     BOOST_CHECK(vchSharedPubKey1 == vchSharedPubKey2);
-    std::cout << "Exit: dht_key_getlinksharedpubkey_test\n";
 
 }
 
diff --git a/src/test/governance_validators_tests.cpp b/src/test/governance_validators_tests.cpp
index fdfea6d606..5e03c541f3 100644
--- a/src/test/governance_validators_tests.cpp
+++ b/src/test/governance_validators_tests.cpp
@@ -20,6 +20,7 @@
 
 #include <univalue.h>
 
+#ifdef ENABLE_GOVERNANCE_TESTS
 extern UniValue read_json(const std::string& jsondata);
 
 BOOST_FIXTURE_TEST_SUITE(governance_validators_tests, BasicTestingSetup)
@@ -83,4 +84,6 @@ BOOST_AUTO_TEST_CASE(invalid_proposals_test)
     }
 }
 
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END()
+
+#endif // ENABLE_GOVERNANCE_TESTS
diff --git a/src/test/hash_tests.cpp b/src/test/hash_tests.cpp
index 3c333f8e9a..05847d2039 100644
--- a/src/test/hash_tests.cpp
+++ b/src/test/hash_tests.cpp
@@ -46,17 +46,58 @@ BOOST_AUTO_TEST_CASE(murmurhash3)
 #undef T
 }
 
+/*
+   SipHash-2-4 output with
+   k = 00 01 02 ...
+   and
+   in = (empty string)
+   in = 00 (1 byte)
+   in = 00 01 (2 bytes)
+   in = 00 01 02 (3 bytes)
+   ...
+   in = 00 01 02 ... 3e (63 bytes)
+
+   from: https://131002.net/siphash/siphash24.c
+*/
+uint64_t siphash_4_2_testvec[] = {
+    0x726fdb47dd0e0e31, 0x74f839c593dc67fd, 0x0d6c8009d9a94f5a, 0x85676696d7fb7e2d,
+    0xcf2794e0277187b7, 0x18765564cd99a68d, 0xcbc9466e58fee3ce, 0xab0200f58b01d137,
+    0x93f5f5799a932462, 0x9e0082df0ba9e4b0, 0x7a5dbbc594ddb9f3, 0xf4b32f46226bada7,
+    0x751e8fbc860ee5fb, 0x14ea5627c0843d90, 0xf723ca908e7af2ee, 0xa129ca6149be45e5,
+    0x3f2acc7f57c29bdb, 0x699ae9f52cbe4794, 0x4bc1b3f0968dd39c, 0xbb6dc91da77961bd,
+    0xbed65cf21aa2ee98, 0xd0f2cbb02e3b67c7, 0x93536795e3a33e88, 0xa80c038ccd5ccec8,
+    0xb8ad50c6f649af94, 0xbce192de8a85b8ea, 0x17d835b85bbb15f3, 0x2f2e6163076bcfad,
+    0xde4daaaca71dc9a5, 0xa6a2506687956571, 0xad87a3535c49ef28, 0x32d892fad841c342,
+    0x7127512f72f27cce, 0xa7f32346f95978e3, 0x12e0b01abb051238, 0x15e034d40fa197ae,
+    0x314dffbe0815a3b4, 0x027990f029623981, 0xcadcd4e59ef40c4d, 0x9abfd8766a33735c,
+    0x0e3ea96b5304a7d0, 0xad0c42d6fc585992, 0x187306c89bc215a9, 0xd4a60abcf3792b95,
+    0xf935451de4f21df2, 0xa9538f0419755787, 0xdb9acddff56ca510, 0xd06c98cd5c0975eb,
+    0xe612a3cb9ecba951, 0xc766e62cfcadaf96, 0xee64435a9752fe72, 0xa192d576b245165a,
+    0x0a8787bf8ecb74b2, 0x81b3e73d20b49b6f, 0x7fa8220ba3b2ecea, 0x245731c13ca42499,
+    0xb78dbfaf3a8d83bd, 0xea1ad565322a1a0b, 0x60e61c23a3795013, 0x6606d7e446282b93,
+    0x6ca4ecb15c5f91e1, 0x9f626da15c9625f3, 0xe51b38608ef25f57, 0x958a324ceb064572
+};
+
 BOOST_AUTO_TEST_CASE(siphash)
 {
     CSipHasher hasher(0x0706050403020100ULL, 0x0F0E0D0C0B0A0908ULL);
     BOOST_CHECK_EQUAL(hasher.Finalize(),  0x726fdb47dd0e0e31ull);
-    hasher.Write(0x0706050403020100ULL);
+    static const unsigned char t0[1] = {0};
+    hasher.Write(t0, 1);
+    BOOST_CHECK_EQUAL(hasher.Finalize(),  0x74f839c593dc67fdull);
+    static const unsigned char t1[7] = {1,2,3,4,5,6,7};
+    hasher.Write(t1, 7);
     BOOST_CHECK_EQUAL(hasher.Finalize(),  0x93f5f5799a932462ull);
     hasher.Write(0x0F0E0D0C0B0A0908ULL);
     BOOST_CHECK_EQUAL(hasher.Finalize(),  0x3f2acc7f57c29bdbull);
-    hasher.Write(0x1716151413121110ULL);
-    BOOST_CHECK_EQUAL(hasher.Finalize(),  0xb8ad50c6f649af94ull);
-    hasher.Write(0x1F1E1D1C1B1A1918ULL);
+    static const unsigned char t2[2] = {16,17};
+    hasher.Write(t2, 2);
+    BOOST_CHECK_EQUAL(hasher.Finalize(),  0x4bc1b3f0968dd39cull);
+    static const unsigned char t3[9] = {18,19,20,21,22,23,24,25,26};
+    hasher.Write(t3, 9);
+    BOOST_CHECK_EQUAL(hasher.Finalize(),  0x2f2e6163076bcfadull);
+    static const unsigned char t4[5] = {27,28,29,30,31};
+    hasher.Write(t4, 5);
     BOOST_CHECK_EQUAL(hasher.Finalize(),  0x7127512f72f27cceull);
     hasher.Write(0x2726252423222120ULL);
     BOOST_CHECK_EQUAL(hasher.Finalize(),  0x0e3ea96b5304a7d0ull);
@@ -65,6 +106,22 @@ BOOST_AUTO_TEST_CASE(siphash)
 
     BOOST_CHECK_EQUAL(SipHashUint256(0x0706050403020100ULL, 0x0F0E0D0C0B0A0908ULL, uint256S("1f1e1d1c1b1a191817161514131211100f0e0d0c0b0a09080706050403020100")), 0x7127512f72f27cceull);
 
+    // Check test vectors from spec, one byte at a time
+    CSipHasher hasher2(0x0706050403020100ULL, 0x0F0E0D0C0B0A0908ULL);
+    for (uint8_t x=0; x<ARRAYLEN(siphash_4_2_testvec); ++x)
+    {
+        BOOST_CHECK_EQUAL(hasher2.Finalize(), siphash_4_2_testvec[x]);
+        hasher2.Write(&x, 1);
+    }
+    // Check test vectors from spec, eight bytes at a time
+    CSipHasher hasher3(0x0706050403020100ULL, 0x0F0E0D0C0B0A0908ULL);
+    for (uint8_t x=0; x<ARRAYLEN(siphash_4_2_testvec); x+=8)
+    {
+        BOOST_CHECK_EQUAL(hasher3.Finalize(), siphash_4_2_testvec[x]);
+        hasher3.Write(uint64_t(x)|(uint64_t(x+1)<<8)|(uint64_t(x+2)<<16)|(uint64_t(x+3)<<24)|
+                     (uint64_t(x+4)<<32)|(uint64_t(x+5)<<40)|(uint64_t(x+6)<<48)|(uint64_t(x+7)<<56));
+    }
+
     // Check consistency between CSipHasher and SipHashUint256[Extra].
     // TODO reenable when backporting Bitcoin #10321
     /*FastRandomContext ctx;
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
index 69c4191efd..65555236bc 100644
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -26,41 +26,45 @@
 
 #include <boost/test/unit_test.hpp>
 
-BOOST_FIXTURE_TEST_SUITE(miner_tests, TestingSetup)
+struct TestnetSetup : public TestingSetup {
+    TestnetSetup() : TestingSetup(CBaseChainParams::TESTNET) {}
+};
+
+BOOST_FIXTURE_TEST_SUITE(miner_tests, TestnetSetup)
 
 static
 struct {
     unsigned char extranonce;
     unsigned int nonce;
 } blockinfo[] = {
-    {0, 0x009c5477}, {0, 0x00a94582}, {0, 0x00af3d7f}, {0, 0x00d0b721},
-    {0, 0x00d53e10}, {0, 0x00f52f0f}, {0, 0x00fb5876}, {0, 0x0117fb12},
-    {0, 0x011f930b}, {0, 0x013365d2}, {0, 0x0151737e}, {0, 0x0152cdd0},
-    {0, 0x01758d20}, {0, 0x0178d509}, {0, 0x0192103c}, {0, 0x01a3f1b8},
-    {0, 0x01abc9c7}, {0, 0x01d2f50c}, {0, 0x01eebad1}, {0, 0x01ef3419},
-    {0, 0x01f3f154}, {0, 0x01fa6245}, {0, 0x0224e780}, {0, 0x02281625},
-    {0, 0x023a4d10}, {0, 0x0251d3cf}, {0, 0x02555277}, {0, 0x02648a41},
-    {0, 0x0280795e}, {0, 0x02a3a585}, {0, 0x02ade34a}, {0, 0x02b02b02},
-    {0, 0x02c9dc32}, {0, 0x02da9867}, {0, 0x02e4126e}, {0, 0x02e738c7},
-    {0, 0x02f5c6a9}, {0, 0x0307bb0f}, {0, 0x0328ea58}, {0, 0x034fe819},
-    {0, 0x036c6fcb}, {0, 0x039b8e11}, {0, 0x039fec90}, {0, 0x03a268ff},
-    {0, 0x03d37583}, {0, 0x03d6a9a7}, {0, 0x03e7a013}, {0, 0x03f01ebe},
-    {0, 0x0437104d}, {0, 0x043d0af7}, {0, 0x043d824d}, {0, 0x043f50fc},
-    {0, 0x044def8c}, {0, 0x0452309a}, {0, 0x04538bd3}, {0, 0x0459286b},
-    {0, 0x045bc734}, {0, 0x045c878a}, {0, 0x0485d3ba}, {0, 0x048a64e5},
-    {0, 0x048d6ae1}, {0, 0x048dcfec}, {0, 0x049d2c79}, {0, 0x04ade791},
-    {0, 0x04b75856}, {0, 0x04c1f89e}, {0, 0x04c2f731}, {0, 0x04ca0376},
-    {0, 0x04ca102a}, {0, 0x04cbdfe5}, {0, 0x04cbe35a}, {0, 0x04ccfa95},
-    {0, 0x04dcd6e4}, {0, 0x05066d8b}, {0, 0x05150274}, {0, 0x051dcfa0},
-    {0, 0x052a4c40}, {0, 0x05310c4e}, {0, 0x05452f69}, {0, 0x05517592},
-    {0, 0x05543eb8}, {0, 0x05549dc7}, {0, 0x05732695}, {0, 0x057b00d3},
-    {0, 0x0584760d}, {0, 0x059ca419}, {0, 0x05b23b58}, {0, 0x05c69745},
-    {0, 0x05e31a12}, {0, 0x05e932d5}, {0, 0x05ef8400}, {0, 0x05f0bdf6},
-    {0, 0x05f93997}, {0, 0x05ff2978}, {0, 0x06030233}, {0, 0x0627d615},
-    {0, 0x0644a441}, {0, 0x06518661}, {0, 0x06805ef2}, {0, 0x068c43dd},
-    {0, 0x069cca16}, {0, 0x06acbf10}, {0, 0x06c2d607}, {0, 0x06d9ea08},
-    {0, 0x0700d639}, {0, 0x07083d86}, {0, 0x071cc39d}, {0, 0x072c3cb8},
-    {0, 0x07665a0f}, {0, 0x07741214},
+    {0, 0x0000002d}, {0, 0x0000003a}, {0, 0x0000005a}, {0, 0x000000fe},
+    {0, 0x0000008e}, {0, 0x00000059}, {0, 0x00000047}, {0, 0x00000002},
+    {0, 0x0000007e}, {0, 0x00000113}, {0, 0x000000ed}, {0, 0x00000222},
+    {0, 0x00000023}, {0, 0x0000033d}, {0, 0x000001c0}, {0, 0x000002b6},
+    {0, 0x0000017f}, {0, 0x00000413}, {0, 0x0000006b}, {0, 0x000001b0},
+    {0, 0x000001da}, {0, 0x00000057}, {0, 0x000003ec}, {0, 0x000000e9},
+    {0, 0x00000163}, {0, 0x000002df}, {0, 0x00000210}, {0, 0x00000417},
+    {0, 0x00000020}, {0, 0x0000035d}, {0, 0x000004d7}, {0, 0x00000c76},
+    {0, 0x000002e0}, {0, 0x0000089f}, {0, 0x0000019c}, {0, 0x000019d3},
+    {0, 0x00000267}, {0, 0x0000339e}, {0, 0x00000e6d}, {0, 0x0000009d},
+    {0, 0x00000651}, {0, 0x000009d2}, {0, 0x00000ad7}, {0, 0x00000042},
+    {0, 0x000007a9}, {0, 0x000006d5}, {0, 0x00000520}, {0, 0x00001b5f},
+    {0, 0x000011d0}, {0, 0x0000343e}, {0, 0x00001eb3}, {0, 0x0000190c},
+    {0, 0x00000af6}, {0, 0x0000988c}, {0, 0x00000d92}, {0, 0x000034c2},
+    {0, 0x00010758}, {0, 0x0000d811}, {0, 0x00005181}, {0, 0x00009f91},
+    {0, 0x00006ca9}, {0, 0x00021238}, {0, 0x0001715d}, {0, 0x0000ec02},
+    {0, 0x00012713}, {0, 0x0000a83b}, {0, 0x0000e960}, {0, 0x0002ee6c},
+    {0, 0x00001398}, {0, 0x000012f4}, {0, 0x00017f8f}, {0, 0x0001f52a},
+    {0, 0x00003239}, {0, 0x000109fa}, {0, 0x00009765}, {0, 0x0000285f},
+    {0, 0x000002e6}, {0, 0x00030797}, {0, 0x00005d15}, {0, 0x00041501},
+    {0, 0x00001e26}, {0, 0x00004ddf}, {0, 0x00016652}, {0, 0x000b928e},
+    {0, 0x000de016}, {0, 0x00082f30}, {0, 0x0000e1f1}, {0, 0x000125da},
+    {0, 0x000cfbbe}, {0, 0x000d958c}, {0, 0x00025e54}, {0, 0x0003f379},
+    {0, 0x000663ec}, {0, 0x002302d6}, {0, 0x001bb337}, {0, 0x00150a69},
+    {0, 0x0002bbc4}, {0, 0x0002c196}, {0, 0x0012dac6}, {0, 0x00025c0b},
+    {0, 0x000e3f0f}, {0, 0x000a597e}, {0, 0x00215367}, {0, 0x0022519f},
+    {0, 0x001629a7}, {0, 0x000076ea}, {0, 0x0032b76e}, {0, 0x001a5b01},
+    {0, 0x001a75af}, {0, 0x00238db1}
 };
 
 CBlockIndex CreateBlockIndex(int nHeight)
@@ -117,7 +121,7 @@ BOOST_AUTO_TEST_CASE(ScanNoncesGPU_check)
 // NOTE: These tests rely on CreateNewBlock doing its own self-validation!
 BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
 {
-    const CChainParams& chainparams = Params(CBaseChainParams::MAIN);
+    const CChainParams& chainparams = Params(CBaseChainParams::TESTNET);
     CScript scriptPubKey = CScript() << ParseHex("04678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5f") << OP_CHECKSIG;
     std::unique_ptr<CBlockTemplate> pblocktemplate;
     CMutableTransaction tx,tx2;
@@ -131,18 +135,16 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
     LOCK(cs_main);
     fCheckpointsEnabled = false;
 
-    // force UpdatedBlockTip to initialize nCachedBlockHeight
-    dnpayments.UpdatedBlockTip(chainActive.Tip(), *connman);
-
-    // Simple block creation, nothing special yet:
-    BOOST_CHECK(pblocktemplate = CreateNewBlock(chainparams, scriptPubKey));
-
     // We can't make transactions until we have inputs
     // Therefore, load 100 blocks :)
     int baseheight = 0;
     std::vector<CTransactionRef> txFirst;
     for (unsigned int i = 0; i < sizeof(blockinfo)/sizeof(*blockinfo); ++i)
     {
+        BOOST_CHECK(pblocktemplate = CreateNewBlock(chainparams, scriptPubKey));
+        // force UpdatedBlockTip to initialize nCachedBlockHeight
+        dnpayments.UpdatedBlockTip(chainActive.Tip(), *connman);
+
         CBlock *pblock = &pblocktemplate->block; // pointer for convenience
         pblock->nVersion = 2;
         pblock->nTime = chainActive.Tip()->GetMedianTimePast()+1;
diff --git a/src/test/ratecheck_tests.cpp b/src/test/ratecheck_tests.cpp
index 74e42ea266..de25c08dde 100644
--- a/src/test/ratecheck_tests.cpp
+++ b/src/test/ratecheck_tests.cpp
@@ -19,8 +19,6 @@ BOOST_AUTO_TEST_CASE(ratecheck_test)
 
     buffer.AddTimestamp(1);
 
-    std::cout << "buffer.GetMinTimestamp() = " << buffer.GetMinTimestamp() << std::endl;
-
     BOOST_CHECK(buffer.GetCount() == 1);
     BOOST_CHECK(buffer.GetMinTimestamp() == 1);
     BOOST_CHECK(buffer.GetMaxTimestamp() == 1);
@@ -42,11 +40,6 @@ BOOST_AUTO_TEST_CASE(ratecheck_test)
     int64_t nMax = buffer.GetMaxTimestamp();
     double dRate = buffer.GetRate();
 
-    std::cout << "buffer.GetCount() = " << buffer.GetCount() << std::endl;
-    std::cout << "nMin = " << nMin << std::endl;
-    std::cout << "nMax = " << nMax << std::endl;
-    std::cout << "buffer.GetRate() = " << dRate << std::endl;
-
     //BOOST_CHECK(fabs(buffer.GetRate() - (3.0/2.0)) < 1.0e-9);
     BOOST_CHECK(buffer.GetRate() == 0.0);
 
@@ -71,9 +64,7 @@ BOOST_AUTO_TEST_CASE(ratecheck_test)
 
     CRateCheckBuffer buffer2;
 
-    std::cout << "Before loop tests" << std::endl;
     for(int64_t i = 1; i < 11; ++i)  {
-        std::cout << "In loop: i = " << i << std::endl;
         buffer2.AddTimestamp(i);
         BOOST_CHECK(buffer2.GetCount() == (i <= 5 ? i : 5));
         BOOST_CHECK(buffer2.GetMinTimestamp() == std::max(int64_t(1), i - 4));
diff --git a/src/test/stealth_tests.cpp b/src/test/stealth_tests.cpp
index 78b51ce7f4..f835a2b25e 100644
--- a/src/test/stealth_tests.cpp
+++ b/src/test/stealth_tests.cpp
@@ -142,7 +142,6 @@ BOOST_AUTO_TEST_CASE(stealth_test1)
     //cleanup
     delete pwalletMain2;
     pwalletMain2 = NULL;
-    std::cout << "Exit: stealth_test1\n";
     }
 } //stealth_test1
 
@@ -249,8 +248,6 @@ BOOST_AUTO_TEST_CASE(stealth_test1_negative)
     //cleanup
     delete pwalletMain2;
     pwalletMain2 = NULL;
-
-    std::cout << "Exit: stealth_test1_negative\n";
     }
 } //stealth_test1_negative
 
@@ -347,8 +344,6 @@ BOOST_AUTO_TEST_CASE(stealth_test2)
     //cleanup
     delete pwalletMain2;
     pwalletMain2 = NULL;
-
-    std::cout << "Exit: stealth_test2\n";
     }
 
 } //stealth_test2
diff --git a/src/validation.cpp b/src/validation.cpp
index 2818dd3b8a..f6be7e5e4d 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -2923,9 +2923,9 @@ static bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockInd
     // TODO: resync data (both ways?) and try to reprocess this block later.
     bool fDynodePaid = false;
 
-    if (chainActive.Height() > Params().GetConsensus().nDynodePaymentsStartBlock) {
+    if (chainActive.Height() > chainparams.GetConsensus().nDynodePaymentsStartBlock) {
         fDynodePaid = true;
-    } else if (chainActive.Height() <= Params().GetConsensus().nDynodePaymentsStartBlock) {
+    } else if (chainActive.Height() <= chainparams.GetConsensus().nDynodePaymentsStartBlock) {
         fDynodePaid = false;
     }
 
@@ -2934,10 +2934,10 @@ static bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockInd
     std::string strError = "";
     {
         CBlockIndex* prevIndex = pindex->pprev;
-        CAmount newMiningReward = GetFluidMiningReward(pindex->nHeight);
+        CAmount newMiningReward = GetFluidMiningReward(pindex->nHeight, chainparams.GetConsensus());
         CAmount newDynodeReward = 0;
         if (fDynodePaid)
-            newDynodeReward = GetFluidDynodeReward(pindex->nHeight);
+            newDynodeReward = GetFluidDynodeReward(pindex->nHeight, chainparams.GetConsensus());
 
         CAmount newMintIssuance = 0;
         CDynamicAddress mintAddress;
@@ -4166,7 +4166,7 @@ bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& sta
     int nHeight = (pindexPrev->nHeight + 1);
     uint256 hash = block.GetHash();
 
-    if (hash == Params().GetConsensus().hashGenesisBlock)
+    if (hash == consensusParams.hashGenesisBlock)
         return true;
 
     if (block.nBits != GetNextWorkRequired(pindexPrev, block, consensusParams)) {
@@ -4224,7 +4224,7 @@ bool ContextualCheckBlock(const CBlock& block, CValidationState& state, const Co
     CDynamicAddress mintAddress;
     CAmount fluidIssuance;
 
-    if (fluid.GetMintingInstructions(pindexPrev, mintAddress, fluidIssuance)) {
+    if (fluid.GetMintingInstructions(pindexPrev, mintAddress, fluidIssuance, consensusParams)) {
         bool found = false;
 
         CScript script;