diff --git a/test/test_fees.sh b/src/omnicore/test/test_fees.sh
similarity index 61%
rename from test/test_fees.sh
rename to src/omnicore/test/test_fees.sh
index 617dc030f8734..d569030e8d583 100755
--- a/test/test_fees.sh
+++ b/src/omnicore/test/test_fees.sh
@@ -11,61 +11,62 @@
 ## must be removed and Omni Core recompiled to use on mainnet.                                ##
 ################################################################################################
 
-
+SRCDIR=./src/
+NUL=/dev/null
 PASS=0
 FAIL=0
 clear
 printf "Preparing a test environment...\n"
 printf "   * Starting a fresh regtest daemon\n"
 rm -r ~/.bitcoin/regtest
-./src/omnicored --regtest --server --daemon --omniactivationallowsender=any >nul
+$SRCDIR/omnicored --regtest --server --daemon --omniactivationallowsender=any >$NUL
 sleep 3
 printf "   * Preparing some mature testnet BTC\n"
-./src/omnicore-cli --regtest setgenerate true 102 >null
+$SRCDIR/omnicore-cli --regtest setgenerate true 102 >$NUL
 printf "   * Obtaining a master address to work with\n"
-ADDR=$(./src/omnicore-cli --regtest getnewaddress OMNIAccount)
+ADDR=$($SRCDIR/omnicore-cli --regtest getnewaddress OMNIAccount)
 printf "   * Funding the address with some testnet BTC for fees\n"
-./src/omnicore-cli --regtest sendtoaddress $ADDR 20 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
+$SRCDIR/omnicore-cli --regtest sendtoaddress $ADDR 20 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Participating in the Exodus crowdsale to obtain some OMNI\n"
 JSON="{\"moneyqMan7uh8FqdCA2BV5yZ8qVrc9ikLP\":10,\""$ADDR"\":4}"
-./src/omnicore-cli --regtest sendmany OMNIAccount $JSON >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
+$SRCDIR/omnicore-cli --regtest sendmany OMNIAccount $JSON >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Creating an indivisible test property\n"
-./src/omnicore-cli --regtest omni_sendissuancefixed $ADDR 1 1 0 "Z_TestCat" "Z_TestSubCat" "Z_IndivisTestProperty" "Z_TestURL" "Z_TestData" 10000000 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
+$SRCDIR/omnicore-cli --regtest omni_sendissuancefixed $ADDR 1 1 0 "Z_TestCat" "Z_TestSubCat" "Z_IndivisTestProperty" "Z_TestURL" "Z_TestData" 10000000 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Creating a divisible test property\n"
-./src/omnicore-cli --regtest omni_sendissuancefixed $ADDR 1 2 0 "Z_TestCat" "Z_TestSubCat" "Z_DivisTestProperty" "Z_TestURL" "Z_TestData" 10000 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
+$SRCDIR/omnicore-cli --regtest omni_sendissuancefixed $ADDR 1 2 0 "Z_TestCat" "Z_TestSubCat" "Z_DivisTestProperty" "Z_TestURL" "Z_TestData" 10000 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Creating an indivisible test property in the test ecosystem\n"
-./src/omnicore-cli --regtest omni_sendissuancefixed $ADDR 2 1 0 "Z_TestCat" "Z_TestSubCat" "Z_IndivisTestProperty" "Z_TestURL" "Z_TestData" 10000000 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
+$SRCDIR/omnicore-cli --regtest omni_sendissuancefixed $ADDR 2 1 0 "Z_TestCat" "Z_TestSubCat" "Z_IndivisTestProperty" "Z_TestURL" "Z_TestData" 10000000 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Generating addresses to use as fee recipients (OMNI holders)\n"
 ADDRESS=()
 for i in {1..6}
 do
-   ADDRESS=("${ADDRESS[@]}" $(./src/omnicore-cli --regtest getnewaddress))
+   ADDRESS=("${ADDRESS[@]}" $($SRCDIR/omnicore-cli --regtest getnewaddress))
 done
 printf "   * Using a total of 1000 OMNI\n"
 printf "   * Seeding %s with 50.00 OMNI\n" ${ADDRESS[1]}
-./src/omnicore-cli --regtest omni_send $ADDR ${ADDRESS[1]} 1 50.0 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
+$SRCDIR/omnicore-cli --regtest omni_send $ADDR ${ADDRESS[1]} 1 50.0 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Seeding %s with 100.00 OMNI\n" ${ADDRESS[2]}
-./src/omnicore-cli --regtest omni_send $ADDR ${ADDRESS[2]} 1 100.0 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
+$SRCDIR/omnicore-cli --regtest omni_send $ADDR ${ADDRESS[2]} 1 100.0 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Seeding %s with 150.00 OMNI\n" ${ADDRESS[3]}
-./src/omnicore-cli --regtest omni_send $ADDR ${ADDRESS[3]} 1 150.0 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
+$SRCDIR/omnicore-cli --regtest omni_send $ADDR ${ADDRESS[3]} 1 150.0 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Seeding %s with 200.00 OMNI\n" ${ADDRESS[4]}
-./src/omnicore-cli --regtest omni_send $ADDR ${ADDRESS[4]} 1 200.0 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
+$SRCDIR/omnicore-cli --regtest omni_send $ADDR ${ADDRESS[4]} 1 200.0 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "\nActivating the fee system...\n"
 printf "   * Sending the activation\n"
-BLOCKS=$(./src/omnicore-cli --regtest getblockcount)
-TXID=$(./src/omnicore-cli --regtest omni_sendactivation $ADDR 9 $(($BLOCKS + 8)) 999)
-./src/omnicore-cli --regtest setgenerate true 1 >null
+BLOCKS=$($SRCDIR/omnicore-cli --regtest getblockcount)
+TXID=$($SRCDIR/omnicore-cli --regtest omni_sendactivation $ADDR 9 $(($BLOCKS + 8)) 999)
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "     # Checking the activation transaction was valid..."
-RESULT=$(./src/omnicore-cli --regtest omni_gettransaction $TXID | grep valid | cut -c15-)
+RESULT=$($SRCDIR/omnicore-cli --regtest omni_gettransaction $TXID | grep valid | cut -c15-)
 if [ $RESULT == "true," ]
   then
     printf "PASS\n"
@@ -75,9 +76,9 @@ if [ $RESULT == "true," ]
     FAIL=$((FAIL+1))
 fi
 printf "   * Mining 10 blocks to forward past the activation block\n"
-./src/omnicore-cli --regtest setgenerate true 10 >null
+$SRCDIR/omnicore-cli --regtest setgenerate true 10 >$NUL
 printf "     # Checking the activation went live as expected..."
-FEATUREID=$(./src/omnicore-cli --regtest omni_getactivations | grep -A 10 completed | grep featureid | cut -c27)
+FEATUREID=$($SRCDIR/omnicore-cli --regtest omni_getactivations | grep -A 10 completed | grep featureid | cut -c27)
 if [ $FEATUREID == "9" ]
   then
     printf "PASS\n"
@@ -88,7 +89,7 @@ if [ $FEATUREID == "9" ]
 fi
 printf "\nChecking share of fees for recipients...\n"
 printf "   * Checking %s has a 5 percent share of fees... " ${ADDRESS[1]}
-FEESHARE=$(./src/omnicore-cli --regtest omni_getfeeshare ${ADDRESS[1]} | grep feeshare | cut -d '"' -f4)
+FEESHARE=$($SRCDIR/omnicore-cli --regtest omni_getfeeshare ${ADDRESS[1]} | grep feeshare | cut -d '"' -f4)
 if [ $FEESHARE == "5.0000%" ]
   then
     printf "PASS\n"
@@ -98,7 +99,7 @@ if [ $FEESHARE == "5.0000%" ]
     FAIL=$((FAIL+1))
 fi
 printf "   * Checking %s has a 10 percent share of fees... " ${ADDRESS[2]}
-FEESHARE=$(./src/omnicore-cli --regtest omni_getfeeshare ${ADDRESS[2]} | grep feeshare | cut -d '"' -f4)
+FEESHARE=$($SRCDIR/omnicore-cli --regtest omni_getfeeshare ${ADDRESS[2]} | grep feeshare | cut -d '"' -f4)
 if [ $FEESHARE == "10.0000%" ]
   then
     printf "PASS\n"
@@ -108,7 +109,7 @@ if [ $FEESHARE == "10.0000%" ]
     FAIL=$((FAIL+1))
 fi
 printf "   * Checking %s has a 15 percent share of fees... " ${ADDRESS[3]}
-FEESHARE=$(./src/omnicore-cli --regtest omni_getfeeshare ${ADDRESS[3]} | grep feeshare | cut -d '"' -f4)
+FEESHARE=$($SRCDIR/omnicore-cli --regtest omni_getfeeshare ${ADDRESS[3]} | grep feeshare | cut -d '"' -f4)
 if [ $FEESHARE == "15.0000%" ]
   then
     printf "PASS\n"
@@ -118,7 +119,7 @@ if [ $FEESHARE == "15.0000%" ]
     FAIL=$((FAIL+1))
 fi
 printf "   * Checking %s has a 20 percent share of fees... " ${ADDRESS[4]}
-FEESHARE=$(./src/omnicore-cli --regtest omni_getfeeshare ${ADDRESS[4]} | grep feeshare | cut -d '"' -f4)
+FEESHARE=$($SRCDIR/omnicore-cli --regtest omni_getfeeshare ${ADDRESS[4]} | grep feeshare | cut -d '"' -f4)
 if [ $FEESHARE == "20.0000%" ]
   then
     printf "PASS\n"
@@ -128,7 +129,7 @@ if [ $FEESHARE == "20.0000%" ]
     FAIL=$((FAIL+1))
 fi
 printf "   * Checking %s has a 50 percent share of fees... " $ADDR
-FEESHARE=$(./src/omnicore-cli --regtest omni_getfeeshare $ADDR | grep feeshare | cut -d '"' -f4)
+FEESHARE=$($SRCDIR/omnicore-cli --regtest omni_getfeeshare $ADDR | grep feeshare | cut -d '"' -f4)
 if [ $FEESHARE == "50.0000%" ]
   then
     printf "PASS\n"
@@ -138,7 +139,7 @@ if [ $FEESHARE == "50.0000%" ]
     FAIL=$((FAIL+1))
 fi
 printf "   * Checking %s has a 100 percent share of fees in the test ecosystem... " $ADDR
-FEESHARE=$(./src/omnicore-cli --regtest omni_getfeeshare $ADDR 2 | grep feeshare | cut -d '"' -f4)
+FEESHARE=$($SRCDIR/omnicore-cli --regtest omni_getfeeshare $ADDR 2 | grep feeshare | cut -d '"' -f4)
 if [ $FEESHARE == "100.0000%" ]
   then
     printf "PASS\n"
@@ -149,13 +150,13 @@ if [ $FEESHARE == "100.0000%" ]
 fi
 printf "\nTesting a trade against self that results in a 1 willet fee for property 3 (1.0 OMNI for 2000 #3)\n"
 printf "   * Executing the trade\n"
-./src/omnicore-cli --regtest omni_sendtrade $ADDR 3 2000 1 1.0 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
-./src/omnicore-cli --regtest omni_sendtrade $ADDR 1 1.0 3 2000 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
+$SRCDIR/omnicore-cli --regtest omni_sendtrade $ADDR 3 2000 1 1.0 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
+$SRCDIR/omnicore-cli --regtest omni_sendtrade $ADDR 1 1.0 3 2000 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Verifiying the results\n"
 printf "      # Checking the fee cache now has 1 fee cached for property 3..."
-CACHEDFEE=$(./src/omnicore-cli --regtest omni_getfeecache 3 | grep cachedfee | cut -d '"' -f4)
+CACHEDFEE=$($SRCDIR/omnicore-cli --regtest omni_getfeecache 3 | grep cachedfee | cut -d '"' -f4)
 if [ $CACHEDFEE == "1" ]
   then
     printf "PASS\n"
@@ -165,7 +166,7 @@ if [ $CACHEDFEE == "1" ]
     FAIL=$((FAIL+1))
 fi
 printf "      # Checking the trading address now owns 9999999 of property 3..."
-BALANCE=$(./src/omnicore-cli --regtest omni_getbalance $ADDR 3 | grep balance | cut -d '"' -f4)
+BALANCE=$($SRCDIR/omnicore-cli --regtest omni_getbalance $ADDR 3 | grep balance | cut -d '"' -f4)
 if [ $BALANCE == "9999999" ]
   then
     printf "PASS\n"
@@ -176,13 +177,13 @@ if [ $BALANCE == "9999999" ]
 fi
 printf "\nTesting another trade against self that results in a 5 willet fee for property 3 (1.0 OMNI for 10000 #3)\n"
 printf "   * Executing the trade\n"
-./src/omnicore-cli --regtest omni_sendtrade $ADDR 3 10000 1 1.0 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
-./src/omnicore-cli --regtest omni_sendtrade $ADDR 1 1.0 3 10000 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
+$SRCDIR/omnicore-cli --regtest omni_sendtrade $ADDR 3 10000 1 1.0 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
+$SRCDIR/omnicore-cli --regtest omni_sendtrade $ADDR 1 1.0 3 10000 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Verifiying the results\n"
 printf "      # Checking the fee cache now has 6 fee cached for property 3... "
-CACHEDFEE=$(./src/omnicore-cli --regtest omni_getfeecache 3 | grep cachedfee | cut -d '"' -f4)
+CACHEDFEE=$($SRCDIR/omnicore-cli --regtest omni_getfeecache 3 | grep cachedfee | cut -d '"' -f4)
 if [ $CACHEDFEE == "6" ]
   then
     printf "PASS\n"
@@ -192,7 +193,7 @@ if [ $CACHEDFEE == "6" ]
     FAIL=$((FAIL+1))
 fi
 printf "      # Checking the trading address now owns 9999994 instead of property 3... "
-BALANCE=$(./src/omnicore-cli --regtest omni_getbalance $ADDR 3 | grep balance | cut -d '"' -f4)
+BALANCE=$($SRCDIR/omnicore-cli --regtest omni_getbalance $ADDR 3 | grep balance | cut -d '"' -f4)
 if [ $BALANCE == "9999994" ]
   then
     printf "PASS\n"
@@ -203,13 +204,13 @@ if [ $BALANCE == "9999994" ]
 fi
 printf "\nTesting a trade against self that results in a 1 willet fee for property 4 (1.0 OMNI for 0.00002 #4)\n"
 printf "   * Executing the trade\n"
-./src/omnicore-cli --regtest omni_sendtrade $ADDR 4 0.00002000 1 1.0 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
-./src/omnicore-cli --regtest omni_sendtrade $ADDR 1 1.0 4 0.00002000 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
+$SRCDIR/omnicore-cli --regtest omni_sendtrade $ADDR 4 0.00002000 1 1.0 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
+$SRCDIR/omnicore-cli --regtest omni_sendtrade $ADDR 1 1.0 4 0.00002000 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Verifiying the results\n"
 printf "      # Checking the fee cache now has 0.00000001 fee cached for property 4... "
-CACHEDFEE=$(./src/omnicore-cli --regtest omni_getfeecache 4 | grep cachedfee | cut -d '"' -f4)
+CACHEDFEE=$($SRCDIR/omnicore-cli --regtest omni_getfeecache 4 | grep cachedfee | cut -d '"' -f4)
 if [ $CACHEDFEE == "0.00000001" ]
   then
     printf "PASS\n"
@@ -219,7 +220,7 @@ if [ $CACHEDFEE == "0.00000001" ]
     FAIL=$((FAIL+1))
 fi
 printf "      # Checking the trading address now owns 9999.99999999 of property 4... "
-BALANCE=$(./src/omnicore-cli --regtest omni_getbalance $ADDR 4 | grep balance | cut -d '"' -f4)
+BALANCE=$($SRCDIR/omnicore-cli --regtest omni_getbalance $ADDR 4 | grep balance | cut -d '"' -f4)
 if [ $BALANCE == "9999.99999999" ]
   then
     printf "PASS\n"
@@ -230,13 +231,13 @@ if [ $BALANCE == "9999.99999999" ]
 fi
 printf "\nTesting a trade against self that results in a 5000 willet fee for property 4 (1.0 OMNI for 0.1 #4)\n"
 printf "   * Executing the trade\n"
-./src/omnicore-cli --regtest omni_sendtrade $ADDR 4 0.1 1 1.0 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
-./src/omnicore-cli --regtest omni_sendtrade $ADDR 1 1.0 4 0.1 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
+$SRCDIR/omnicore-cli --regtest omni_sendtrade $ADDR 4 0.1 1 1.0 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
+$SRCDIR/omnicore-cli --regtest omni_sendtrade $ADDR 1 1.0 4 0.1 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Verifiying the results\n"
 printf "      # Checking the fee cache now has 0.00005001 fee cached for property 4... "
-CACHEDFEE=$(./src/omnicore-cli --regtest omni_getfeecache 4 | grep cachedfee | cut -d '"' -f4)
+CACHEDFEE=$($SRCDIR/omnicore-cli --regtest omni_getfeecache 4 | grep cachedfee | cut -d '"' -f4)
 if [ $CACHEDFEE == "0.00005001" ]
   then
     printf "PASS\n"
@@ -246,7 +247,7 @@ if [ $CACHEDFEE == "0.00005001" ]
     FAIL=$((FAIL+1))
 fi
 printf "      # Checking the trading address now owns 9999.99994999 of property 4... "
-BALANCE=$(./src/omnicore-cli --regtest omni_getbalance $ADDR 4 | grep balance | cut -d '"' -f4)
+BALANCE=$($SRCDIR/omnicore-cli --regtest omni_getbalance $ADDR 4 | grep balance | cut -d '"' -f4)
 if [ $BALANCE == "9999.99994999" ]
   then
     printf "PASS\n"
@@ -259,14 +260,14 @@ printf "\nIncreasing volume to get close to 10000000 fee trigger point for prope
 printf "   * Executing the trades\n"
 for i in {1..5}
 do
-    ./src/omnicore-cli --regtest omni_sendtrade $ADDR 4 39.96 1 1.0 >null
-    ./src/omnicore-cli --regtest setgenerate true 1 >null
-    ./src/omnicore-cli --regtest omni_sendtrade $ADDR 1 1.0 4 39.96 >null
-    ./src/omnicore-cli --regtest setgenerate true 1 >null
+    $SRCDIR/omnicore-cli --regtest omni_sendtrade $ADDR 4 39.96 1 1.0 >$NUL
+    $SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
+    $SRCDIR/omnicore-cli --regtest omni_sendtrade $ADDR 1 1.0 4 39.96 >$NUL
+    $SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 done
 printf "   * Verifiying the results\n"
 printf "      # Checking the fee cache now has 0.09995001 fee cached for property 4... "
-CACHEDFEE=$(./src/omnicore-cli --regtest omni_getfeecache 4 | grep cachedfee | cut -d '"' -f4)
+CACHEDFEE=$($SRCDIR/omnicore-cli --regtest omni_getfeecache 4 | grep cachedfee | cut -d '"' -f4)
 if [ $CACHEDFEE == "0.09995001" ]
   then
     printf "PASS\n"
@@ -276,7 +277,7 @@ if [ $CACHEDFEE == "0.09995001" ]
     FAIL=$((FAIL+1))
 fi
 printf "      # Checking the trading address now owns 9999.90004999 of property 4... "
-BALANCE=$(./src/omnicore-cli --regtest omni_getbalance $ADDR 4 | grep balance | cut -d '"' -f4)
+BALANCE=$($SRCDIR/omnicore-cli --regtest omni_getbalance $ADDR 4 | grep balance | cut -d '"' -f4)
 if [ $BALANCE == "9999.90004999" ]
   then
     printf "PASS\n"
@@ -287,12 +288,12 @@ if [ $BALANCE == "9999.90004999" ]
 fi
 printf "\nPerforming a small trade to take fee cache to 0.1 and trigger distribution for property 4\n"
 printf "   * Executing the trade\n"
-./src/omnicore-cli --regtest omni_sendtrade $ADDR 4 0.09999999 1 0.8 >null
-./src/omnicore-cli --regtest omni_sendtrade $ADDR 1 0.8 4 0.09999999 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
+$SRCDIR/omnicore-cli --regtest omni_sendtrade $ADDR 4 0.09999999 1 0.8 >$NUL
+$SRCDIR/omnicore-cli --regtest omni_sendtrade $ADDR 1 0.8 4 0.09999999 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Verifiying the results\n"
 printf "      # Checking distribution was triggered and the fee cache is now empty for property 4... "
-CACHEDFEE=$(./src/omnicore-cli --regtest omni_getfeecache 4 | grep cachedfee | cut -d '"' -f4)
+CACHEDFEE=$($SRCDIR/omnicore-cli --regtest omni_getfeecache 4 | grep cachedfee | cut -d '"' -f4)
 if [ $CACHEDFEE == "0.00000000" ]
   then
     printf "PASS\n"
@@ -302,7 +303,7 @@ if [ $CACHEDFEE == "0.00000000" ]
     FAIL=$((FAIL+1))
 fi
 printf "      # Checking %s received 0.00500000 fee share... " ${ADDRESS[1]}
-BALANCE=$(./src/omnicore-cli --regtest omni_getbalance ${ADDRESS[1]} 4 | grep balance | cut -d '"' -f4)
+BALANCE=$($SRCDIR/omnicore-cli --regtest omni_getbalance ${ADDRESS[1]} 4 | grep balance | cut -d '"' -f4)
 if [ $BALANCE == "0.00500000" ]
   then
     printf "PASS\n"
@@ -312,7 +313,7 @@ if [ $BALANCE == "0.00500000" ]
     FAIL=$((FAIL+1))
 fi
 printf "      # Checking %s received 0.01000000 fee share... " ${ADDRESS[2]}
-BALANCE=$(./src/omnicore-cli --regtest omni_getbalance ${ADDRESS[2]} 4 | grep balance | cut -d '"' -f4)
+BALANCE=$($SRCDIR/omnicore-cli --regtest omni_getbalance ${ADDRESS[2]} 4 | grep balance | cut -d '"' -f4)
 if [ $BALANCE == "0.01000000" ]
   then
     printf "PASS\n"
@@ -322,7 +323,7 @@ if [ $BALANCE == "0.01000000" ]
     FAIL=$((FAIL+1))
 fi
 printf "      # Checking %s received 0.01500000 fee share... " ${ADDRESS[3]}
-BALANCE=$(./src/omnicore-cli --regtest omni_getbalance ${ADDRESS[3]} 4 | grep balance | cut -d '"' -f4)
+BALANCE=$($SRCDIR/omnicore-cli --regtest omni_getbalance ${ADDRESS[3]} 4 | grep balance | cut -d '"' -f4)
 if [ $BALANCE == "0.01500000" ]
   then
     printf "PASS\n"
@@ -332,7 +333,7 @@ if [ $BALANCE == "0.01500000" ]
     FAIL=$((FAIL+1))
 fi
 printf "      # Checking %s received 0.02000000 fee share... " ${ADDRESS[4]}
-BALANCE=$(./src/omnicore-cli --regtest omni_getbalance ${ADDRESS[4]} 4 | grep balance | cut -d '"' -f4)
+BALANCE=$($SRCDIR/omnicore-cli --regtest omni_getbalance ${ADDRESS[4]} 4 | grep balance | cut -d '"' -f4)
 if [ $BALANCE == "0.02000000" ]
   then
     printf "PASS\n"
@@ -342,7 +343,7 @@ if [ $BALANCE == "0.02000000" ]
     FAIL=$((FAIL+1))
 fi
 printf "      # Checking %s received 0.05000000 fee share... " $ADDR
-BALANCE=$(./src/omnicore-cli --regtest omni_getbalance $ADDR 4 | grep balance | cut -d '"' -f4)
+BALANCE=$($SRCDIR/omnicore-cli --regtest omni_getbalance $ADDR 4 | grep balance | cut -d '"' -f4)
 if [ $BALANCE == "9999.95000000" ]
   then
     printf "PASS\n"
@@ -351,15 +352,15 @@ if [ $BALANCE == "9999.95000000" ]
     printf "FAIL (result:%s)\n" $BALANCE
     FAIL=$((FAIL+1))
 fi
-./src/omnicore-cli --regtest omni_getfeetrigger 2147483651
+$SRCDIR/omnicore-cli --regtest omni_getfeetrigger 2147483651
 printf "\nRolling back the chain to orphan a block and the last trade to test reorg protection (disconnecting 1 block from tip and mining a replacement)\n"
 printf "   * Executing the rollback\n"
-BLOCK=$(./src/omnicore-cli --regtest getblockcount)
-BLOCKHASH=$(./src/omnicore-cli --regtest getblockhash $(($BLOCK)))
-./src/omnicore-cli --regtest invalidateblock $BLOCKHASH >null
-PREVBLOCK=$(./src/omnicore-cli --regtest getblockcount)
+BLOCK=$($SRCDIR/omnicore-cli --regtest getblockcount)
+BLOCKHASH=$($SRCDIR/omnicore-cli --regtest getblockhash $(($BLOCK)))
+$SRCDIR/omnicore-cli --regtest invalidateblock $BLOCKHASH >$NUL
+PREVBLOCK=$($SRCDIR/omnicore-cli --regtest getblockcount)
 printf "   * Clearing the mempool\n"
-./src/omnicore-cli --regtest clearmempool >null
+$SRCDIR/omnicore-cli --regtest clearmempool >$NUL
 printf "   * Verifiying the results\n"
 printf "      # Checking the block count has been reduced by 1... "
 EXPBLOCK=$((BLOCK-1))
@@ -372,10 +373,10 @@ if [ $EXPBLOCK == $PREVBLOCK ]
     FAIL=$((FAIL+1))
 fi
 printf "   * Mining a replacement block\n"
-./src/omnicore-cli --regtest setgenerate true 1 >null
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Verifiying the results\n"
-NEWBLOCK=$(./src/omnicore-cli --regtest getblockcount)
-NEWBLOCKHASH=$(./src/omnicore-cli --regtest getblockhash $(($BLOCK)))
+NEWBLOCK=$($SRCDIR/omnicore-cli --regtest getblockcount)
+NEWBLOCKHASH=$($SRCDIR/omnicore-cli --regtest getblockhash $(($BLOCK)))
 printf "      # Checking the block count is the same as before the rollback... "
 if [ $BLOCK == $NEWBLOCK ]
   then
@@ -395,7 +396,7 @@ if [ $BLOCKHASH == $NEWBLOCKHASH ]
     PASS=$((PASS+1))
 fi
 printf "      # Checking the fee cache now again has 0.09995001 fee cached for property 4... "
-CACHEDFEE=$(./src/omnicore-cli --regtest omni_getfeecache 4 | grep cachedfee | cut -d '"' -f4)
+CACHEDFEE=$($SRCDIR/omnicore-cli --regtest omni_getfeecache 4 | grep cachedfee | cut -d '"' -f4)
 if [ $CACHEDFEE == "0.09995001" ]
   then
     printf "PASS\n"
@@ -405,7 +406,7 @@ if [ $CACHEDFEE == "0.09995001" ]
     FAIL=$((FAIL+1))
 fi
 printf "      # Checking %s balance has been rolled back to 0... " ${ADDRESS[1]}
-BALANCE=$(./src/omnicore-cli --regtest omni_getbalance ${ADDRESS[1]} 4 | grep balance | cut -d '"' -f4)
+BALANCE=$($SRCDIR/omnicore-cli --regtest omni_getbalance ${ADDRESS[1]} 4 | grep balance | cut -d '"' -f4)
 if [ $BALANCE == "0.00000000" ]
   then
     printf "PASS\n"
@@ -415,7 +416,7 @@ if [ $BALANCE == "0.00000000" ]
     FAIL=$((FAIL+1))
 fi
 printf "      # Checking %s balance has been rolled back to 0... " ${ADDRESS[2]}
-BALANCE=$(./src/omnicore-cli --regtest omni_getbalance ${ADDRESS[2]} 4 | grep balance | cut -d '"' -f4)
+BALANCE=$($SRCDIR/omnicore-cli --regtest omni_getbalance ${ADDRESS[2]} 4 | grep balance | cut -d '"' -f4)
 if [ $BALANCE == "0.00000000" ]
   then
     printf "PASS\n"
@@ -425,7 +426,7 @@ if [ $BALANCE == "0.00000000" ]
     FAIL=$((FAIL+1))
 fi
 printf "      # Checking %s balance has been rolled back to 0... " ${ADDRESS[3]}
-BALANCE=$(./src/omnicore-cli --regtest omni_getbalance ${ADDRESS[3]} 4 | grep balance | cut -d '"' -f4)
+BALANCE=$($SRCDIR/omnicore-cli --regtest omni_getbalance ${ADDRESS[3]} 4 | grep balance | cut -d '"' -f4)
 if [ $BALANCE == "0.00000000" ]
   then
     printf "PASS\n"
@@ -435,7 +436,7 @@ if [ $BALANCE == "0.00000000" ]
     FAIL=$((FAIL+1))
 fi
 printf "      # Checking %s balance has been rolled back to 0... " ${ADDRESS[4]}
-BALANCE=$(./src/omnicore-cli --regtest omni_getbalance ${ADDRESS[4]} 4 | grep balance | cut -d '"' -f4)
+BALANCE=$($SRCDIR/omnicore-cli --regtest omni_getbalance ${ADDRESS[4]} 4 | grep balance | cut -d '"' -f4)
 if [ $BALANCE == "0.00000000" ]
   then
     printf "PASS\n"
@@ -445,7 +446,7 @@ if [ $BALANCE == "0.00000000" ]
     FAIL=$((FAIL+1))
 fi
 printf "      # Checking %s balance has been rolled back to 9999.90004999... " $ADDR
-BALANCE=$(./src/omnicore-cli --regtest omni_getbalance $ADDR 4 | grep balance | cut -d '"' -f4)
+BALANCE=$($SRCDIR/omnicore-cli --regtest omni_getbalance $ADDR 4 | grep balance | cut -d '"' -f4)
 if [ $BALANCE == "9999.90004999" ]
   then
     printf "PASS\n"
@@ -456,12 +457,12 @@ if [ $BALANCE == "9999.90004999" ]
 fi
 printf "\nPerforming a small trade to take fee cache to 0.1 and retrigger distribution for property 4\n"
 printf "   * Executing the trade\n"
-./src/omnicore-cli --regtest omni_sendtrade $ADDR 4 0.09999999 1 0.8 >null
-./src/omnicore-cli --regtest omni_sendtrade $ADDR 1 0.8 4 0.09999999 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
+$SRCDIR/omnicore-cli --regtest omni_sendtrade $ADDR 4 0.09999999 1 0.8 >$NUL
+$SRCDIR/omnicore-cli --regtest omni_sendtrade $ADDR 1 0.8 4 0.09999999 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Verifiying the results\n"
 printf "      # Checking distribution was triggered and the fee cache is now empty for property 4... "
-CACHEDFEE=$(./src/omnicore-cli --regtest omni_getfeecache 4 | grep cachedfee | cut -d '"' -f4)
+CACHEDFEE=$($SRCDIR/omnicore-cli --regtest omni_getfeecache 4 | grep cachedfee | cut -d '"' -f4)
 if [ $CACHEDFEE == "0.00000000" ]
   then
     printf "PASS\n"
@@ -472,13 +473,13 @@ if [ $CACHEDFEE == "0.00000000" ]
 fi
 printf "\nTesting a trade against self that results in a 1 willet fee for property 4 (1.0 OMNI for 0.00002 #4)\n"
 printf "   * Executing the trade\n"
-./src/omnicore-cli --regtest omni_sendtrade $ADDR 4 0.00002000 1 1.0 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
-./src/omnicore-cli --regtest omni_sendtrade $ADDR 1 1.0 4 0.00002000 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
+$SRCDIR/omnicore-cli --regtest omni_sendtrade $ADDR 4 0.00002000 1 1.0 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
+$SRCDIR/omnicore-cli --regtest omni_sendtrade $ADDR 1 1.0 4 0.00002000 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Verifiying the results\n"
 printf "      # Checking the fee cache now has 0.00000001 fee cached for property 4... "
-CACHEDFEE=$(./src/omnicore-cli --regtest omni_getfeecache 4 | grep cachedfee | cut -d '"' -f4)
+CACHEDFEE=$($SRCDIR/omnicore-cli --regtest omni_getfeecache 4 | grep cachedfee | cut -d '"' -f4)
 if [ $CACHEDFEE == "0.00000001" ]
   then
     printf "PASS\n"
@@ -489,13 +490,13 @@ if [ $CACHEDFEE == "0.00000001" ]
 fi
 printf "\nTesting another trade against self that results in a 1 willet fee for property 4 (1.0 OMNI for 0.00002 #4)\n"
 printf "   * Executing the trade\n"
-./src/omnicore-cli --regtest omni_sendtrade $ADDR 4 0.00002000 1 1.0 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
-./src/omnicore-cli --regtest omni_sendtrade $ADDR 1 1.0 4 0.00002000 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
+$SRCDIR/omnicore-cli --regtest omni_sendtrade $ADDR 4 0.00002000 1 1.0 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
+$SRCDIR/omnicore-cli --regtest omni_sendtrade $ADDR 1 1.0 4 0.00002000 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Verifiying the results\n"
 printf "      # Checking the fee cache now has 0.00000002 fee cached for property 4... "
-CACHEDFEE=$(./src/omnicore-cli --regtest omni_getfeecache 4 | grep cachedfee | cut -d '"' -f4)
+CACHEDFEE=$($SRCDIR/omnicore-cli --regtest omni_getfeecache 4 | grep cachedfee | cut -d '"' -f4)
 if [ $CACHEDFEE == "0.00000002" ]
   then
     printf "PASS\n"
@@ -506,12 +507,12 @@ if [ $CACHEDFEE == "0.00000002" ]
 fi
 printf "\nRolling back the chain to orphan a block (disconnecting 1 block from tip and mining a replacement)\n"
 printf "   * Executing the rollback\n"
-BLOCK=$(./src/omnicore-cli --regtest getblockcount)
-BLOCKHASH=$(./src/omnicore-cli --regtest getblockhash $(($BLOCK)))
-./src/omnicore-cli --regtest invalidateblock $BLOCKHASH >null
-PREVBLOCK=$(./src/omnicore-cli --regtest getblockcount)
+BLOCK=$($SRCDIR/omnicore-cli --regtest getblockcount)
+BLOCKHASH=$($SRCDIR/omnicore-cli --regtest getblockhash $(($BLOCK)))
+$SRCDIR/omnicore-cli --regtest invalidateblock $BLOCKHASH >$NUL
+PREVBLOCK=$($SRCDIR/omnicore-cli --regtest getblockcount)
 printf "   * Clearing the mempool\n"
-./src/omnicore-cli --regtest clearmempool >null
+$SRCDIR/omnicore-cli --regtest clearmempool >$NUL
 printf "   * Verifiying the results\n"
 printf "      # Checking the block count has been reduced by 1... "
 EXPBLOCK=$((BLOCK-1))
@@ -524,10 +525,10 @@ if [ $EXPBLOCK == $PREVBLOCK ]
     FAIL=$((FAIL+1))
 fi
 printf "   * Mining a replacement block\n"
-./src/omnicore-cli --regtest setgenerate true 1 >null
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Verifiying the results\n"
-NEWBLOCK=$(./src/omnicore-cli --regtest getblockcount)
-NEWBLOCKHASH=$(./src/omnicore-cli --regtest getblockhash $(($BLOCK)))
+NEWBLOCK=$($SRCDIR/omnicore-cli --regtest getblockcount)
+NEWBLOCKHASH=$($SRCDIR/omnicore-cli --regtest getblockhash $(($BLOCK)))
 printf "      # Checking the block count is the same as before the rollback... "
 if [ $BLOCK == $NEWBLOCK ]
   then
@@ -547,7 +548,7 @@ if [ $BLOCKHASH == $NEWBLOCKHASH ]
     PASS=$((PASS+1))
 fi
 printf "      # Checking the fee cache has been rolled back to 0.00000001 for property 4... "
-CACHEDFEE=$(./src/omnicore-cli --regtest omni_getfeecache 4 | grep cachedfee | cut -d '"' -f4)
+CACHEDFEE=$($SRCDIR/omnicore-cli --regtest omni_getfeecache 4 | grep cachedfee | cut -d '"' -f4)
 if [ $CACHEDFEE == "0.00000001" ]
   then
     printf "PASS\n"
@@ -559,7 +560,7 @@ fi
 printf "\nMining 51 blocks to test that fee cache is not affected by fee pruning\n"
 printf "   * Verifiying the results\n"
 printf "      # Checking the fee cache is 0.00000001 for property 4... "
-CACHEDFEE=$(./src/omnicore-cli --regtest omni_getfeecache 4 | grep cachedfee | cut -d '"' -f4)
+CACHEDFEE=$($SRCDIR/omnicore-cli --regtest omni_getfeecache 4 | grep cachedfee | cut -d '"' -f4)
 if [ $CACHEDFEE == "0.00000001" ]
   then
     printf "PASS\n"
@@ -569,9 +570,9 @@ if [ $CACHEDFEE == "0.00000001" ]
     FAIL=$((FAIL+1))
 fi
 printf "   * Mining the blocks...\n"
-./src/omnicore-cli --regtest setgenerate true 51 >null
+$SRCDIR/omnicore-cli --regtest setgenerate true 51 >$NUL
 printf "      # Checking the fee cache is still 0.00000001 for property 4... "
-CACHEDFEE=$(./src/omnicore-cli --regtest omni_getfeecache 4 | grep cachedfee | cut -d '"' -f4)
+CACHEDFEE=$($SRCDIR/omnicore-cli --regtest omni_getfeecache 4 | grep cachedfee | cut -d '"' -f4)
 if [ $CACHEDFEE == "0.00000001" ]
   then
     printf "PASS\n"
@@ -581,12 +582,12 @@ if [ $CACHEDFEE == "0.00000001" ]
     FAIL=$((FAIL+1))
 fi
 printf "   * Executing a trade to generate 1 willet fee\n"
-./src/omnicore-cli --regtest omni_sendtrade $ADDR 4 0.00002000 1 1.0 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
-./src/omnicore-cli --regtest omni_sendtrade $ADDR 1 1.0 4 0.00002000 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
+$SRCDIR/omnicore-cli --regtest omni_sendtrade $ADDR 4 0.00002000 1 1.0 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
+$SRCDIR/omnicore-cli --regtest omni_sendtrade $ADDR 1 1.0 4 0.00002000 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "      # Checking the fee cache now has 0.00000002 fee cached for property 4... "
-CACHEDFEE=$(./src/omnicore-cli --regtest omni_getfeecache 4 | grep cachedfee | cut -d '"' -f4)
+CACHEDFEE=$($SRCDIR/omnicore-cli --regtest omni_getfeecache 4 | grep cachedfee | cut -d '"' -f4)
 if [ $CACHEDFEE == "0.00000002" ]
   then
     printf "PASS\n"
@@ -596,12 +597,12 @@ if [ $CACHEDFEE == "0.00000002" ]
     FAIL=$((FAIL+1))
 fi
 printf "   * Executing a trade to generate 1 willet fee\n"
-./src/omnicore-cli --regtest omni_sendtrade $ADDR 4 0.00002000 1 1.0 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
-./src/omnicore-cli --regtest omni_sendtrade $ADDR 1 1.0 4 0.00002000 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
+$SRCDIR/omnicore-cli --regtest omni_sendtrade $ADDR 4 0.00002000 1 1.0 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
+$SRCDIR/omnicore-cli --regtest omni_sendtrade $ADDR 1 1.0 4 0.00002000 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "      # Checking the fee cache now has 0.00000003 fee cached for property 4... "
-CACHEDFEE=$(./src/omnicore-cli --regtest omni_getfeecache 4 | grep cachedfee | cut -d '"' -f4)
+CACHEDFEE=$($SRCDIR/omnicore-cli --regtest omni_getfeecache 4 | grep cachedfee | cut -d '"' -f4)
 if [ $CACHEDFEE == "0.00000003" ]
   then
     printf "PASS\n"
@@ -614,14 +615,14 @@ printf "\nAdding some test ecosystem volume to trigger distribution\n"
 printf "   * Executing the trades\n"
 for i in {1..9}
 do
-    ./src/omnicore-cli --regtest omni_sendtrade $ADDR 2147483651 20000 2 10.0 >null
-    ./src/omnicore-cli --regtest setgenerate true 1 >null
-    ./src/omnicore-cli --regtest omni_sendtrade $ADDR 2 10.0 2147483651 20000 >null
-    ./src/omnicore-cli --regtest setgenerate true 1 >null
+    $SRCDIR/omnicore-cli --regtest omni_sendtrade $ADDR 2147483651 20000 2 10.0 >$NUL
+    $SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
+    $SRCDIR/omnicore-cli --regtest omni_sendtrade $ADDR 2 10.0 2147483651 20000 >$NUL
+    $SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 done
 printf "   * Verifiying the results\n"
 printf "      # Checking the fee cache now has 90 fee cached for property 2147483651... "
-CACHEDFEE=$(./src/omnicore-cli --regtest omni_getfeecache 2147483651 | grep cachedfee | cut -d '"' -f4)
+CACHEDFEE=$($SRCDIR/omnicore-cli --regtest omni_getfeecache 2147483651 | grep cachedfee | cut -d '"' -f4)
 if [ $CACHEDFEE == "90" ]
   then
     printf "PASS\n"
@@ -631,7 +632,7 @@ if [ $CACHEDFEE == "90" ]
     FAIL=$((FAIL+1))
 fi
 printf "      # Checking the trading address now owns 9999910 of property 2147483651... "
-BALANCE=$(./src/omnicore-cli --regtest omni_getbalance $ADDR 2147483651 | grep balance | cut -d '"' -f4)
+BALANCE=$($SRCDIR/omnicore-cli --regtest omni_getbalance $ADDR 2147483651 | grep balance | cut -d '"' -f4)
 if [ $BALANCE == "9999910" ]
   then
     printf "PASS\n"
@@ -642,13 +643,13 @@ if [ $BALANCE == "9999910" ]
 fi
 printf "\nTriggering distribution in the test ecosystem for property 2147483651\n"
 printf "   * Executing the trade\n"
-./src/omnicore-cli --regtest omni_sendtrade $ADDR 2147483651 20000 2 10.0 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
-./src/omnicore-cli --regtest omni_sendtrade $ADDR 2 10.0 2147483651 20000 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
+$SRCDIR/omnicore-cli --regtest omni_sendtrade $ADDR 2147483651 20000 2 10.0 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
+$SRCDIR/omnicore-cli --regtest omni_sendtrade $ADDR 2 10.0 2147483651 20000 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Verifiying the results\n"
 printf "      # Checking distribution was triggered and the fee cache is now empty for property 2147483651... "
-CACHEDFEE=$(./src/omnicore-cli --regtest omni_getfeecache 2147483651 | grep cachedfee | cut -d '"' -f4)
+CACHEDFEE=$($SRCDIR/omnicore-cli --regtest omni_getfeecache 2147483651 | grep cachedfee | cut -d '"' -f4)
 if [ $CACHEDFEE == "0" ]
   then
     printf "PASS\n"
@@ -658,7 +659,7 @@ if [ $CACHEDFEE == "0" ]
     FAIL=$((FAIL+1))
 fi
 printf "      # Checking %s received 100 fee share... " $ADDR
-BALANCE=$(./src/omnicore-cli --regtest omni_getbalance $ADDR 2147483651 | grep balance | cut -d '"' -f4)
+BALANCE=$($SRCDIR/omnicore-cli --regtest omni_getbalance $ADDR 2147483651 | grep balance | cut -d '"' -f4)
 if [ $BALANCE == "10000000" ]
   then
     printf "PASS\n"
@@ -675,8 +676,5 @@ printf "#    Failed = %d    #\n" $FAIL
 printf "####################\n"
 printf "\n"
 
-./src/omnicore-cli --regtest stop
-
-
-
+$SRCDIR/omnicore-cli --regtest stop
 
diff --git a/test/test_metadexphase3.sh b/src/omnicore/test/test_metadexphase3.sh
similarity index 55%
rename from test/test_metadexphase3.sh
rename to src/omnicore/test/test_metadexphase3.sh
index 9e38e3d30bbd3..78f46ffec95d3 100755
--- a/test/test_metadexphase3.sh
+++ b/src/omnicore/test/test_metadexphase3.sh
@@ -1,37 +1,39 @@
 #!/bin/bash
 
+SRCDIR=./src/
+NUL=/dev/null
 PASS=0
 FAIL=0
 clear
 printf "Preparing a test environment...\n"
 printf "   * Starting a fresh regtest daemon with open activation sender\n"
 rm -r ~/.bitcoin/regtest
-./src/omnicored --regtest --server --daemon --omniactivationallowsender=any >nul
+$SRCDIR/omnicored --regtest --server --daemon --omniactivationallowsender=any >$NUL
 sleep 3
 printf "   * Preparing some mature testnet BTC\n"
-./src/omnicore-cli --regtest setgenerate true 102 >null
+$SRCDIR/omnicore-cli --regtest setgenerate true 102 >$NUL
 printf "   * Obtaining a master address to work with\n"
-ADDR=$(./src/omnicore-cli --regtest getnewaddress OMNIAccount)
+ADDR=$($SRCDIR/omnicore-cli --regtest getnewaddress OMNIAccount)
 printf "   * Funding the address with some testnet BTC for fees\n"
-./src/omnicore-cli --regtest sendtoaddress $ADDR 20 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
+$SRCDIR/omnicore-cli --regtest sendtoaddress $ADDR 20 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Participating in the Exodus crowdsale to obtain some OMNI\n"
 JSON="{\"moneyqMan7uh8FqdCA2BV5yZ8qVrc9ikLP\":10,\""$ADDR"\":4}"
-./src/omnicore-cli --regtest sendmany OMNIAccount $JSON >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
+$SRCDIR/omnicore-cli --regtest sendmany OMNIAccount $JSON >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Creating an indivisible test property\n"
-./src/omnicore-cli --regtest omni_sendissuancefixed $ADDR 1 1 0 "Z_TestCat" "Z_TestSubCat" "Z_IndivisTestProperty" "Z_TestURL" "Z_TestData" 10000000 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
+$SRCDIR/omnicore-cli --regtest omni_sendissuancefixed $ADDR 1 1 0 "Z_TestCat" "Z_TestSubCat" "Z_IndivisTestProperty" "Z_TestURL" "Z_TestData" 10000000 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Creating a divisible test property\n"
-./src/omnicore-cli --regtest omni_sendissuancefixed $ADDR 1 2 0 "Z_TestCat" "Z_TestSubCat" "Z_DivisTestProperty" "Z_TestURL" "Z_TestData" 10000 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
+$SRCDIR/omnicore-cli --regtest omni_sendissuancefixed $ADDR 1 2 0 "Z_TestCat" "Z_TestSubCat" "Z_DivisTestProperty" "Z_TestURL" "Z_TestData" 10000 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "\nTesting a trade against self that uses Omni (1.1 OMNI for 20 #3)\n"
 printf "   * Executing the trade\n"
-TXID=$(./src/omnicore-cli --regtest omni_sendtrade $ADDR 3 20 1 1.1)
-./src/omnicore-cli --regtest setgenerate true 1 >null
+TXID=$($SRCDIR/omnicore-cli --regtest omni_sendtrade $ADDR 3 20 1 1.1)
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Verifiying the results\n"
 printf "      # Checking the trade was valid..."
-RESULT=$(./src/omnicore-cli --regtest omni_gettransaction $TXID | grep valid | cut -c15-)
+RESULT=$($SRCDIR/omnicore-cli --regtest omni_gettransaction $TXID | grep valid | cut -c15-)
 if [ $RESULT == "true," ]
   then
     printf "PASS\n"
@@ -42,11 +44,11 @@ if [ $RESULT == "true," ]
 fi
 printf "\nTesting a trade against self that doesn't use Omni to confirm non-Omni pairs are disabled (4.45 #4 for 20 #3)\n"
 printf "   * Executing the trade\n"
-TXID=$(./src/omnicore-cli --regtest omni_sendtrade $ADDR 3 20 4 4.45)
-./src/omnicore-cli --regtest setgenerate true 1 >null
+TXID=$($SRCDIR/omnicore-cli --regtest omni_sendtrade $ADDR 3 20 4 4.45)
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Verifiying the results\n"
 printf "      # Checking the trade was invalid..."
-RESULT=$(./src/omnicore-cli --regtest omni_gettransaction $TXID | grep valid | cut -c15-)
+RESULT=$($SRCDIR/omnicore-cli --regtest omni_gettransaction $TXID | grep valid | cut -c15-)
 if [ $RESULT == "false," ]
   then
     printf "PASS\n"
@@ -57,11 +59,11 @@ if [ $RESULT == "false," ]
 fi
 printf "\nActivating trading on all pairs\n"
 printf "   * Sending the activation\n"
-BLOCKS=$(./src/omnicore-cli --regtest getblockcount)
-TXID=$(./src/omnicore-cli --regtest omni_sendactivation $ADDR 8 $(($BLOCKS + 8)) 999)
-./src/omnicore-cli --regtest setgenerate true 1 >null
+BLOCKS=$($SRCDIR/omnicore-cli --regtest getblockcount)
+TXID=$($SRCDIR/omnicore-cli --regtest omni_sendactivation $ADDR 8 $(($BLOCKS + 8)) 999)
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "     # Checking the activation transaction was valid..."
-RESULT=$(./src/omnicore-cli --regtest omni_gettransaction $TXID | grep valid | cut -c15-)
+RESULT=$($SRCDIR/omnicore-cli --regtest omni_gettransaction $TXID | grep valid | cut -c15-)
 if [ $RESULT == "true," ]
   then
     printf "PASS\n"
@@ -71,9 +73,9 @@ if [ $RESULT == "true," ]
     FAIL=$((FAIL+1))
 fi
 printf "   * Mining 10 blocks to forward past the activation block\n"
-./src/omnicore-cli --regtest setgenerate true 10 >null
+$SRCDIR/omnicore-cli --regtest setgenerate true 10 >$NUL
 printf "     # Checking the activation went live as expected..."
-FEATUREID=$(./src/omnicore-cli --regtest omni_getactivations | grep -A 10 completed | grep featureid | cut -c27)
+FEATUREID=$($SRCDIR/omnicore-cli --regtest omni_getactivations | grep -A 10 completed | grep featureid | cut -c27)
 if [ $FEATUREID == "8" ]
   then
     printf "PASS\n"
@@ -84,11 +86,11 @@ if [ $FEATUREID == "8" ]
 fi
 printf "\nTesting a trade against self that doesn't use Omni to confirm non-Omni pairs are now enabled (4.45 #4 for 20 #3)\n"
 printf "   * Executing the trade\n"
-TXID=$(./src/omnicore-cli --regtest omni_sendtrade $ADDR 3 20 4 4.45)
-./src/omnicore-cli --regtest setgenerate true 1 >null
+TXID=$($SRCDIR/omnicore-cli --regtest omni_sendtrade $ADDR 3 20 4 4.45)
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Verifiying the results\n"
 printf "      # Checking the trade was valid..."
-RESULT=$(./src/omnicore-cli --regtest omni_gettransaction $TXID | grep valid | cut -c15-)
+RESULT=$($SRCDIR/omnicore-cli --regtest omni_gettransaction $TXID | grep valid | cut -c15-)
 if [ $RESULT == "true," ]
   then
     printf "PASS\n"
@@ -106,6 +108,5 @@ printf "#    Failed = %d    #\n" $FAIL
 printf "####################\n"
 printf "\n"
 
-./src/omnicore-cli --regtest stop
-
+$SRCDIR/omnicore-cli --regtest stop
 
diff --git a/test/test_metadexprices.sh b/src/omnicore/test/test_metadexprices.sh
similarity index 55%
rename from test/test_metadexprices.sh
rename to src/omnicore/test/test_metadexprices.sh
index aecc7580867e8..b82a841d5d724 100755
--- a/test/test_metadexprices.sh
+++ b/src/omnicore/test/test_metadexprices.sh
@@ -1,40 +1,42 @@
 #!/bin/bash
 
+SRCDIR=./src/
+NUL=/dev/null
 PASS=0
 FAIL=0
 clear
 printf "Preparing a test environment...\n"
 printf "   * Starting a fresh regtest daemon\n"
 rm -r ~/.bitcoin/regtest
-./src/omnicored --regtest --server --daemon >nul
+$SRCDIR/omnicored --regtest --server --daemon >$NUL
 sleep 3
 printf "   * Preparing some mature testnet BTC\n"
-./src/omnicore-cli --regtest setgenerate true 102 >null
+$SRCDIR/omnicore-cli --regtest setgenerate true 102 >$NUL
 printf "   * Obtaining a master address to work with\n"
-ADDR=$(./src/omnicore-cli --regtest getnewaddress OMNIAccount)
+ADDR=$($SRCDIR/omnicore-cli --regtest getnewaddress OMNIAccount)
 printf "   * Funding the address with some testnet BTC for fees\n"
-./src/omnicore-cli --regtest sendtoaddress $ADDR 20 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
+$SRCDIR/omnicore-cli --regtest sendtoaddress $ADDR 20 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Participating in the Exodus crowdsale to obtain some OMNI\n"
 JSON="{\"moneyqMan7uh8FqdCA2BV5yZ8qVrc9ikLP\":10,\""$ADDR"\":4}"
-./src/omnicore-cli --regtest sendmany OMNIAccount $JSON >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
+$SRCDIR/omnicore-cli --regtest sendmany OMNIAccount $JSON >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Creating an indivisible test property\n"
-./src/omnicore-cli --regtest omni_sendissuancefixed $ADDR 1 1 0 "Z_TestCat" "Z_TestSubCat" "Z_IndivisTestProperty" "Z_TestURL" "Z_TestData" 10000000 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
+$SRCDIR/omnicore-cli --regtest omni_sendissuancefixed $ADDR 1 1 0 "Z_TestCat" "Z_TestSubCat" "Z_IndivisTestProperty" "Z_TestURL" "Z_TestData" 10000000 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Creating a divisible test property\n"
-./src/omnicore-cli --regtest omni_sendissuancefixed $ADDR 1 2 0 "Z_TestCat" "Z_TestSubCat" "Z_DivisTestProperty" "Z_TestURL" "Z_TestData" 10000 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
+$SRCDIR/omnicore-cli --regtest omni_sendissuancefixed $ADDR 1 2 0 "Z_TestCat" "Z_TestSubCat" "Z_DivisTestProperty" "Z_TestURL" "Z_TestData" 10000 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Creating another indivisible test property\n"
-./src/omnicore-cli --regtest omni_sendissuancefixed $ADDR 1 1 0 "Z_TestCat" "Z_TestSubCat" "Z_IndivisTestProperty" "Z_TestURL" "Z_TestData" 10000000 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
+$SRCDIR/omnicore-cli --regtest omni_sendissuancefixed $ADDR 1 1 0 "Z_TestCat" "Z_TestSubCat" "Z_IndivisTestProperty" "Z_TestURL" "Z_TestData" 10000000 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "\nTesting a trade against self that uses divisible / divisible (10.0 OMNI for 100.0 #4)\n"
 printf "   * Executing the trade\n"
-TXID=$(./src/omnicore-cli --regtest omni_sendtrade $ADDR 1 10.0 4 100.0)
-./src/omnicore-cli --regtest setgenerate true 1 >null
+TXID=$($SRCDIR/omnicore-cli --regtest omni_sendtrade $ADDR 1 10.0 4 100.0)
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Verifiying the results\n"
 printf "      # Checking the unit price was 10.0..."
-RESULT=$(./src/omnicore-cli --regtest omni_gettransaction $TXID | grep unitprice | cut -d '"' -f4)
+RESULT=$($SRCDIR/omnicore-cli --regtest omni_gettransaction $TXID | grep unitprice | cut -d '"' -f4)
 if [ $RESULT == "10.00000000000000000000000000000000000000000000000000" ]
   then
     printf "PASS\n"
@@ -45,11 +47,11 @@ if [ $RESULT == "10.00000000000000000000000000000000000000000000000000" ]
 fi
 printf "\nTesting a trade against self that uses divisible / indivisible (10.0 OMNI for 100 #3)\n"
 printf "   * Executing the trade\n"
-TXID=$(./src/omnicore-cli --regtest omni_sendtrade $ADDR 1 10.0 3 100)
-./src/omnicore-cli --regtest setgenerate true 1 >null
+TXID=$($SRCDIR/omnicore-cli --regtest omni_sendtrade $ADDR 1 10.0 3 100)
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Verifiying the results\n"
 printf "      # Checking the unit price was 10.0..."
-RESULT=$(./src/omnicore-cli --regtest omni_gettransaction $TXID | grep unitprice | cut -d '"' -f4)
+RESULT=$($SRCDIR/omnicore-cli --regtest omni_gettransaction $TXID | grep unitprice | cut -d '"' -f4)
 if [ $RESULT == "10.00000000000000000000000000000000000000000000000000" ]
   then
     printf "PASS\n"
@@ -60,11 +62,11 @@ if [ $RESULT == "10.00000000000000000000000000000000000000000000000000" ]
 fi
 printf "\nTesting a trade against self that uses indivisible / divisible (10 #3 for 100.0 OMNI)\n"
 printf "   * Executing the trade\n"
-TXID=$(./src/omnicore-cli --regtest omni_sendtrade $ADDR 3 10 1 100.0)
-./src/omnicore-cli --regtest setgenerate true 1 >null
+TXID=$($SRCDIR/omnicore-cli --regtest omni_sendtrade $ADDR 3 10 1 100.0)
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Verifiying the results\n"
 printf "      # Checking the unit price was 10.0..."
-RESULT=$(./src/omnicore-cli --regtest omni_gettransaction $TXID | grep unitprice | cut -d '"' -f4)
+RESULT=$($SRCDIR/omnicore-cli --regtest omni_gettransaction $TXID | grep unitprice | cut -d '"' -f4)
 if [ $RESULT == "10.00000000000000000000000000000000000000000000000000" ]
   then
     printf "PASS\n"
@@ -75,11 +77,11 @@ if [ $RESULT == "10.00000000000000000000000000000000000000000000000000" ]
 fi
 printf "\nTesting a trade against self that uses indivisible / indivisible (10 #5 for 100 #3)\n"
 printf "   * Executing the trade\n"
-TXID=$(./src/omnicore-cli --regtest omni_sendtrade $ADDR 5 10 3 100)
-./src/omnicore-cli --regtest setgenerate true 1 >null
+TXID=$($SRCDIR/omnicore-cli --regtest omni_sendtrade $ADDR 5 10 3 100)
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Verifiying the results\n"
 printf "      # Checking the unit price was 10.0..."
-RESULT=$(./src/omnicore-cli --regtest omni_gettransaction $TXID | grep unitprice | cut -d '"' -f4)
+RESULT=$($SRCDIR/omnicore-cli --regtest omni_gettransaction $TXID | grep unitprice | cut -d '"' -f4)
 if [ $RESULT == "10.00000000000000000000000000000000000000000000000000" ]
   then
     printf "PASS\n"
@@ -97,6 +99,5 @@ printf "#    Failed = %d    #\n" $FAIL
 printf "####################\n"
 printf "\n"
 
-./src/omnicore-cli --regtest stop
-
+$SRCDIR/omnicore-cli --regtest stop
 
diff --git a/test/test_stov1.sh b/src/omnicore/test/test_stov1.sh
similarity index 56%
rename from test/test_stov1.sh
rename to src/omnicore/test/test_stov1.sh
index 2716ca5089386..05f1f98ae261d 100755
--- a/test/test_stov1.sh
+++ b/src/omnicore/test/test_stov1.sh
@@ -1,62 +1,64 @@
 #!/bin/bash
 
+SRCDIR=./src/
+NUL=/dev/null
 PASS=0
 FAIL=0
 clear
 printf "Preparing a test environment...\n"
 printf "   * Starting a fresh regtest daemon\n"
 rm -r ~/.bitcoin/regtest
-./src/omnicored --regtest --server --daemon --omniactivationallowsender=any >nul
+$SRCDIR/omnicored --regtest --server --daemon --omniactivationallowsender=any >$NUL
 sleep 10
 printf "   * Preparing some mature testnet BTC\n"
-./src/omnicore-cli --regtest setgenerate true 102 >null
+$SRCDIR/omnicore-cli --regtest setgenerate true 102 >$NUL
 printf "   * Obtaining a master address to work with\n"
-ADDR=$(./src/omnicore-cli --regtest getnewaddress OMNIAccount)
+ADDR=$($SRCDIR/omnicore-cli --regtest getnewaddress OMNIAccount)
 printf "   * Funding the address with some testnet BTC for fees\n"
-./src/omnicore-cli --regtest sendtoaddress $ADDR 20 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
+$SRCDIR/omnicore-cli --regtest sendtoaddress $ADDR 20 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Participating in the Exodus crowdsale to obtain some OMNI\n"
 JSON="{\"moneyqMan7uh8FqdCA2BV5yZ8qVrc9ikLP\":10,\""$ADDR"\":4}"
-./src/omnicore-cli --regtest sendmany OMNIAccount $JSON >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
+$SRCDIR/omnicore-cli --regtest sendmany OMNIAccount $JSON >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Creating an indivisible test property\n"
-./src/omnicore-cli --regtest omni_sendissuancefixed $ADDR 1 1 0 "Z_TestCat" "Z_TestSubCat" "Z_IndivisTestProperty" "Z_TestURL" "Z_TestData" 100 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
+$SRCDIR/omnicore-cli --regtest omni_sendissuancefixed $ADDR 1 1 0 "Z_TestCat" "Z_TestSubCat" "Z_IndivisTestProperty" "Z_TestURL" "Z_TestData" 100 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Creating a divisible test property\n"
-./src/omnicore-cli --regtest omni_sendissuancefixed $ADDR 1 2 0 "Z_TestCat" "Z_TestSubCat" "Z_DivisTestProperty" "Z_TestURL" "Z_TestData" 10000 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
+$SRCDIR/omnicore-cli --regtest omni_sendissuancefixed $ADDR 1 2 0 "Z_TestCat" "Z_TestSubCat" "Z_DivisTestProperty" "Z_TestURL" "Z_TestData" 10000 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Generating addresses to use as STO recipients\n"
 ADDRESS=()
 for i in {1..11}
 do
-   ADDRESS=("${ADDRESS[@]}" $(./src/omnicore-cli --regtest getnewaddress))
+   ADDRESS=("${ADDRESS[@]}" $($SRCDIR/omnicore-cli --regtest getnewaddress))
 done
 printf "   * Seeding a total of 100 SP#3\n"
 printf "   * Seeding %s with 5%% = 5 SP#3\n" ${ADDRESS[1]}
-./src/omnicore-cli --regtest omni_send $ADDR ${ADDRESS[1]} 3 5 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
+$SRCDIR/omnicore-cli --regtest omni_send $ADDR ${ADDRESS[1]} 3 5 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Seeding %s with 10%% = 10 SP#3\n" ${ADDRESS[2]}
-./src/omnicore-cli --regtest omni_send $ADDR ${ADDRESS[2]} 3 10 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
+$SRCDIR/omnicore-cli --regtest omni_send $ADDR ${ADDRESS[2]} 3 10 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Seeding %s with 15%% = 15 SP#3\n" ${ADDRESS[3]}
-./src/omnicore-cli --regtest omni_send $ADDR ${ADDRESS[3]} 3 15 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
+$SRCDIR/omnicore-cli --regtest omni_send $ADDR ${ADDRESS[3]} 3 15 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Seeding %s with 20%% = 20 SP#3\n" ${ADDRESS[4]}
-./src/omnicore-cli --regtest omni_send $ADDR ${ADDRESS[4]} 3 20 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
+$SRCDIR/omnicore-cli --regtest omni_send $ADDR ${ADDRESS[4]} 3 20 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Seeding %s with 25%% = 25 SP#3\n" ${ADDRESS[5]}
-./src/omnicore-cli --regtest omni_send $ADDR ${ADDRESS[5]} 3 25 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
+$SRCDIR/omnicore-cli --regtest omni_send $ADDR ${ADDRESS[5]} 3 25 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Seeding %s with 25%% = 25 SP#3\n" ${ADDRESS[6]}
-./src/omnicore-cli --regtest omni_send $ADDR ${ADDRESS[6]} 3 25 >null
-./src/omnicore-cli --regtest setgenerate true 1 >null
+$SRCDIR/omnicore-cli --regtest omni_send $ADDR ${ADDRESS[6]} 3 25 >$NUL
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "\nTesting a cross property (v1) STO, distributing 1000.00 SPT #4 to holders of SPT #3\n"
 printf "   * Executing the transaction\n"
-TXID=$(./src/omnicore-cli --regtest omni_sendsto $ADDR 4 1000 "" 3)
-./src/omnicore-cli --regtest setgenerate true 1 >null
+TXID=$($SRCDIR/omnicore-cli --regtest omni_sendsto $ADDR 4 1000 "" 3)
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Verifiying the results\n"
 printf "     # Checking the STO transaction was invalid (feature not yet activated)... "
-RESULT=$(./src/omnicore-cli --regtest omni_gettransaction $TXID | grep valid | cut -c15-)
+RESULT=$($SRCDIR/omnicore-cli --regtest omni_gettransaction $TXID | grep valid | cut -c15-)
 if [ $RESULT == "false," ]
   then
     printf "PASS\n"
@@ -67,11 +69,11 @@ if [ $RESULT == "false," ]
 fi
 printf "\nActivating cross property (v1) Send To Owners...\n"
 printf "   * Sending the activation\n"
-BLOCKS=$(./src/omnicore-cli --regtest getblockcount)
-TXID=$(./src/omnicore-cli --regtest omni_sendactivation $ADDR 10 $(($BLOCKS + 8)) 999)
-./src/omnicore-cli --regtest setgenerate true 1 >null
+BLOCKS=$($SRCDIR/omnicore-cli --regtest getblockcount)
+TXID=$($SRCDIR/omnicore-cli --regtest omni_sendactivation $ADDR 10 $(($BLOCKS + 8)) 999)
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "     # Checking the activation transaction was valid... "
-RESULT=$(./src/omnicore-cli --regtest omni_gettransaction $TXID | grep valid | cut -c15-)
+RESULT=$($SRCDIR/omnicore-cli --regtest omni_gettransaction $TXID | grep valid | cut -c15-)
 if [ $RESULT == "true," ]
   then
     printf "PASS\n"
@@ -81,9 +83,9 @@ if [ $RESULT == "true," ]
     FAIL=$((FAIL+1))
 fi
 printf "   * Mining 10 blocks to forward past the activation block\n"
-./src/omnicore-cli --regtest setgenerate true 10 >null
+$SRCDIR/omnicore-cli --regtest setgenerate true 10 >$NUL
 printf "     # Checking the activation went live as expected... "
-FEATUREID=$(./src/omnicore-cli --regtest omni_getactivations | grep -A 10 completed | grep featureid | cut -c27-28)
+FEATUREID=$($SRCDIR/omnicore-cli --regtest omni_getactivations | grep -A 10 completed | grep featureid | cut -c27-28)
 if [ $FEATUREID == "10" ]
   then
     printf "PASS\n"
@@ -94,11 +96,11 @@ if [ $FEATUREID == "10" ]
 fi
 printf "\nTesting a cross property (v1) STO, distributing 1000.00 SPT #4 to holders of SPT #3\n"
 printf "   * Executing the transaction\n"
-TXID=$(./src/omnicore-cli --regtest omni_sendsto $ADDR 4 1000 "" 3)
-./src/omnicore-cli --regtest setgenerate true 1 >null
+TXID=$($SRCDIR/omnicore-cli --regtest omni_sendsto $ADDR 4 1000 "" 3)
+$SRCDIR/omnicore-cli --regtest setgenerate true 1 >$NUL
 printf "   * Verifiying the results\n"
 printf "     # Checking the STO transaction was valid... "
-RESULT=$(./src/omnicore-cli --regtest omni_gettransaction $TXID | grep valid | cut -c15-)
+RESULT=$($SRCDIR/omnicore-cli --regtest omni_gettransaction $TXID | grep valid | cut -c15-)
 if [ $RESULT == "true," ]
   then
     printf "PASS\n"
@@ -108,7 +110,7 @@ if [ $RESULT == "true," ]
     FAIL=$((FAIL+1))
 fi
 printf "     # Checking the fee cache now has 0.00006000 fee cached for OMNI... "
-CACHEDFEE=$(./src/omnicore-cli --regtest omni_getfeecache 1 | grep cachedfee | cut -d '"' -f4)
+CACHEDFEE=$($SRCDIR/omnicore-cli --regtest omni_getfeecache 1 | grep cachedfee | cut -d '"' -f4)
 if [ $CACHEDFEE == "0.00006000" ]
   then
     printf "PASS\n"
@@ -118,7 +120,7 @@ if [ $CACHEDFEE == "0.00006000" ]
     FAIL=$((FAIL+1))
 fi
 printf "     # Checking %s received 5%% of the distribution (50.00 SPT #4)... " ${ADDRESS[1]}
-BALANCE=$(./src/omnicore-cli --regtest omni_getbalance ${ADDRESS[1]} 4 | grep balance | cut -d '"' -f4)
+BALANCE=$($SRCDIR/omnicore-cli --regtest omni_getbalance ${ADDRESS[1]} 4 | grep balance | cut -d '"' -f4)
 if [ $BALANCE == "50.00000000" ]
   then
     printf "PASS\n"
@@ -128,7 +130,7 @@ if [ $BALANCE == "50.00000000" ]
     FAIL=$((FAIL+1))
 fi
 printf "     # Checking %s received 10%% of the distribution (100.00 SPT #4)... " ${ADDRESS[2]}
-BALANCE=$(./src/omnicore-cli --regtest omni_getbalance ${ADDRESS[2]} 4 | grep balance | cut -d '"' -f4)
+BALANCE=$($SRCDIR/omnicore-cli --regtest omni_getbalance ${ADDRESS[2]} 4 | grep balance | cut -d '"' -f4)
 if [ $BALANCE == "100.00000000" ]
   then
     printf "PASS\n"
@@ -138,7 +140,7 @@ if [ $BALANCE == "100.00000000" ]
     FAIL=$((FAIL+1))
 fi
 printf "     # Checking %s received 15%% of the distribution (150.00 SPT #4)... " ${ADDRESS[3]}
-BALANCE=$(./src/omnicore-cli --regtest omni_getbalance ${ADDRESS[3]} 4 | grep balance | cut -d '"' -f4)
+BALANCE=$($SRCDIR/omnicore-cli --regtest omni_getbalance ${ADDRESS[3]} 4 | grep balance | cut -d '"' -f4)
 if [ $BALANCE == "150.00000000" ]
   then
     printf "PASS\n"
@@ -148,7 +150,7 @@ if [ $BALANCE == "150.00000000" ]
     FAIL=$((FAIL+1))
 fi
 printf "     # Checking %s received 20%% of the distribution (200.00 SPT #4)... " ${ADDRESS[4]}
-BALANCE=$(./src/omnicore-cli --regtest omni_getbalance ${ADDRESS[4]} 4 | grep balance | cut -d '"' -f4)
+BALANCE=$($SRCDIR/omnicore-cli --regtest omni_getbalance ${ADDRESS[4]} 4 | grep balance | cut -d '"' -f4)
 if [ $BALANCE == "200.00000000" ]
   then
     printf "PASS\n"
@@ -158,7 +160,7 @@ if [ $BALANCE == "200.00000000" ]
     FAIL=$((FAIL+1))
 fi
 printf "     # Checking %s received 25%% of the distribution (250.00 SPT #4)... " ${ADDRESS[5]}
-BALANCE=$(./src/omnicore-cli --regtest omni_getbalance ${ADDRESS[5]} 4 | grep balance | cut -d '"' -f4)
+BALANCE=$($SRCDIR/omnicore-cli --regtest omni_getbalance ${ADDRESS[5]} 4 | grep balance | cut -d '"' -f4)
 if [ $BALANCE == "250.00000000" ]
   then
     printf "PASS\n"
@@ -168,7 +170,7 @@ if [ $BALANCE == "250.00000000" ]
     FAIL=$((FAIL+1))
 fi
 printf "     # Checking %s received 25%% of the distribution (250.00 SPT #4)... " ${ADDRESS[6]}
-BALANCE=$(./src/omnicore-cli --regtest omni_getbalance ${ADDRESS[6]} 4 | grep balance | cut -d '"' -f4)
+BALANCE=$($SRCDIR/omnicore-cli --regtest omni_getbalance ${ADDRESS[6]} 4 | grep balance | cut -d '"' -f4)
 if [ $BALANCE == "250.00000000" ]
   then
     printf "PASS\n"
@@ -186,8 +188,5 @@ printf "#    Failed = %d    #\n" $FAIL
 printf "####################\n"
 printf "\n"
 
-./src/omnicore-cli --regtest stop
-
-
-
+$SRCDIR/omnicore-cli --regtest stop