From b6a01ea41c2378911b3abe4dc057bb16318cb7d8 Mon Sep 17 00:00:00 2001
From: Brad Chase <bchase@ripple.com>
Date: Mon, 28 Nov 2016 15:24:59 -0500
Subject: [PATCH] Move support test code to src/test/support (RIPD-1313)

---
 Builds/VisualStudio2015/RippleD.vcxproj       | 486 +++++++--------
 .../VisualStudio2015/RippleD.vcxproj.filters  | 588 +++++++++---------
 CMakeLists.txt                                |  37 +-
 SConstruct                                    |  45 +-
 bin/ci/ubuntu/build-and-test.sh               |   4 +-
 src/ripple/app/ledger/Ledger.cpp              |   1 -
 src/ripple/app/main/Main.cpp                  |   4 +-
 .../basics/impl/CheckLibraryVersions.cpp      |   1 -
 src/ripple/basics/impl/RangeSet.cpp           |   1 -
 src/ripple/basics/impl/StringUtilities.cpp    |   1 -
 src/ripple/basics/impl/TestSuite.test.cpp     |  39 --
 src/ripple/json/impl/Writer.cpp               |   2 +-
 src/ripple/protocol/impl/BuildInfo.cpp        |   1 -
 src/ripple/protocol/impl/STTx.cpp             |   1 -
 src/ripple/shamap/impl/SHAMap.cpp             |   1 -
 src/ripple/shamap/impl/SHAMapSync.cpp         |   1 -
 src/ripple/unity/basics.cpp                   |   1 -
 src/ripple/unity/test.cpp                     |  51 --
 src/test/app/AccountTxPaging_test.cpp         |   2 +-
 src/test/app/CrossingLimits_test.cpp          |   2 +-
 src/test/app/DeliverMin_test.cpp              |   2 +-
 src/test/app/Discrepancy_test.cpp             |   4 +-
 src/test/app/Flow_test.cpp                    |   4 +-
 src/test/app/Freeze_test.cpp                  |   2 +-
 src/test/app/MultiSign_test.cpp               |   2 +-
 src/test/app/Offer_test.cpp                   |   6 +-
 src/test/app/OversizeMeta_test.cpp            |   2 +-
 src/test/app/Path_test.cpp                    |   2 +-
 src/test/app/PayChan_test.cpp                 |   2 +-
 src/test/app/Regression_test.cpp              |   2 +-
 src/test/app/SHAMapStore_test.cpp             |   2 +-
 src/test/app/SetAuth_test.cpp                 |   2 +-
 src/test/app/SetRegularKey_test.cpp           |   2 +-
 src/test/app/SetTrust_test.cpp                |   2 +-
 src/test/app/SusPay_test.cpp                  |   2 +-
 src/test/app/Ticket_test.cpp                  |   2 +-
 src/test/app/Transaction_ordering_test.cpp    |   2 +-
 src/test/app/TrustAndBalance_test.cpp         |   4 +-
 src/test/app/TxQ_test.cpp                     |   6 +-
 src/test/app/ValidatorList_test.cpp           |   2 +-
 src/test/core/Config_test.cpp                 |   2 +-
 src/test/core/Coroutine_test.cpp              |   2 +-
 src/test/core/SociDB_test.cpp                 |   2 +-
 src/test/json/Object_test.cpp                 |   4 +-
 src/test/json/Output_test.cpp                 |   4 +-
 .../json/TestOutputSuite.h}                   |   6 +-
 src/test/json/Writer_test.cpp                 |   4 +-
 src/test/ledger/BookDirs_test.cpp             |   2 +-
 src/test/ledger/Directory_test.cpp            |   2 +-
 src/test/ledger/PaymentSandbox_test.cpp       |   2 +-
 src/test/ledger/SHAMapV2_test.cpp             |   2 +-
 src/test/ledger/SkipList_test.cpp             |   2 +-
 src/test/ledger/View_test.cpp                 |   2 +-
 src/test/nodestore/Backend_test.cpp           |   2 +-
 src/test/nodestore/Basics_test.cpp            |   2 +-
 src/test/nodestore/Database_test.cpp          |   2 +-
 .../Base.test.h => test/nodestore/TestBase.h} |   0
 src/test/nodestore/Timing_test.cpp            |   2 +-
 src/test/overlay/cluster_test.cpp             |   2 +-
 src/test/overlay/manifest_test.cpp            |   2 +-
 src/test/rpc/AccountInfo_test.cpp             |   2 +-
 src/test/rpc/AccountLinesRPC_test.cpp         |   2 +-
 src/test/rpc/AccountObjects_test.cpp          |   2 +-
 src/test/rpc/AccountOffers_test.cpp           |   2 +-
 src/test/rpc/AccountSet_test.cpp              |   2 +-
 src/test/rpc/Book_test.cpp                    |   4 +-
 src/test/rpc/GatewayBalances_test.cpp         |   4 +-
 src/test/rpc/JSONRPC_test.cpp                 |   2 +-
 src/test/rpc/KeyGeneration_test.cpp           |   2 +-
 src/test/rpc/LedgerClosed_test.cpp            |   2 +-
 src/test/rpc/LedgerData_test.cpp              |   2 +-
 src/test/rpc/LedgerRPC_test.cpp               |   2 +-
 src/test/rpc/LedgerRequestRPC_test.cpp        |   2 +-
 src/test/rpc/NoRipple_test.cpp                |   2 +-
 src/test/rpc/RobustTransaction_test.cpp       |   4 +-
 src/test/rpc/ServerInfo_test.cpp              |   2 +-
 src/test/rpc/Subscribe_test.cpp               |   4 +-
 src/test/server/ServerStatus_test.cpp         |   6 +-
 src/test/shamap/FetchPack_test.cpp            |   2 +-
 src/test/shamap/SHAMapSync_test.cpp           |   2 +-
 src/test/shamap/SHAMap_test.cpp               |   2 +-
 .../shamap/tests => test/shamap}/common.h     |   0
 .../test => test/support}/AbstractClient.h    |   0
 .../test => test/support}/BasicNetwork.h      |   0
 src/test/{ => support}/BasicNetwork_test.cpp  |   2 +-
 src/test/{ => support}/Env_test.cpp           |   2 +-
 .../test => test/support}/JSONRPCClient.h     |   2 +-
 .../test => test/support}/ManualTimeKeeper.h  |   0
 .../ledger/tests => test/support}/PathSet.h   |   2 +-
 .../basics => test/support}/TestSuite.h       |   0
 src/{ripple/test => test/support}/WSClient.h  |   2 +-
 src/test/{ => support}/WSClient_test.cpp      |   4 +-
 .../support}/impl/JSONRPCClient.cpp           |   2 +-
 .../support}/impl/ManualTimeKeeper.cpp        |   2 +-
 .../test => test/support}/impl/WSClient.cpp   |   4 +-
 src/{ripple/test => test/support}/jtx.h       |  66 +-
 .../test => test/support}/jtx/Account.h       |   0
 src/{ripple/test => test/support}/jtx/Env.h   |  14 +-
 .../test => test/support}/jtx/Env_ss.h        |   2 +-
 src/{ripple/test => test/support}/jtx/JTx.h   |   4 +-
 .../test => test/support}/jtx/amount.h        |   6 +-
 .../test => test/support}/jtx/balance.h       |   4 +-
 .../test => test/support}/jtx/basic_prop.h    |   0
 .../test => test/support}/jtx/delivermin.h    |   2 +-
 src/{ripple/test => test/support}/jtx/fee.h   |   4 +-
 src/{ripple/test => test/support}/jtx/flags.h |   2 +-
 .../support}/jtx/impl/Account.cpp             |   4 +-
 .../test => test/support}/jtx/impl/Env.cpp    |  22 +-
 .../test => test/support}/jtx/impl/amount.cpp |   4 +-
 .../support}/jtx/impl/balance.cpp             |   2 +-
 .../support}/jtx/impl/delivermin.cpp          |   2 +-
 .../test => test/support}/jtx/impl/fee.cpp    |   2 +-
 .../test => test/support}/jtx/impl/flags.cpp  |   2 +-
 .../support}/jtx/impl/jtx_json.cpp            |   4 +-
 .../test => test/support}/jtx/impl/memo.cpp   |   2 +-
 .../support}/jtx/impl/multisign.cpp           |   4 +-
 .../test => test/support}/jtx/impl/offer.cpp  |   2 +-
 .../test => test/support}/jtx/impl/owners.cpp |   2 +-
 .../test => test/support}/jtx/impl/paths.cpp  |   2 +-
 .../test => test/support}/jtx/impl/pay.cpp    |   2 +-
 .../support}/jtx/impl/quality2.cpp            |   2 +-
 .../test => test/support}/jtx/impl/rate.cpp   |   2 +-
 .../test => test/support}/jtx/impl/regkey.cpp |   2 +-
 .../support}/jtx/impl/sendmax.cpp             |   2 +-
 .../test => test/support}/jtx/impl/seq.cpp    |   2 +-
 .../test => test/support}/jtx/impl/sig.cpp    |   4 +-
 .../test => test/support}/jtx/impl/tag.cpp    |   2 +-
 .../test => test/support}/jtx/impl/ticket.cpp |   2 +-
 .../test => test/support}/jtx/impl/trust.cpp  |   2 +-
 .../support}/jtx/impl/txflags.cpp             |   2 +-
 .../support}/jtx/impl/utility.cpp             |   2 +-
 .../test => test/support}/jtx/jtx_json.h      |   2 +-
 src/{ripple/test => test/support}/jtx/memo.h  |   2 +-
 .../test => test/support}/jtx/multisign.h     |   8 +-
 src/{ripple/test => test/support}/jtx/noop.h  |   2 +-
 src/{ripple/test => test/support}/jtx/offer.h |   2 +-
 .../test => test/support}/jtx/owners.h        |   2 +-
 src/{ripple/test => test/support}/jtx/paths.h |   2 +-
 src/{ripple/test => test/support}/jtx/pay.h   |   4 +-
 src/{ripple/test => test/support}/jtx/prop.h  |   2 +-
 .../test => test/support}/jtx/quality.h       |   2 +-
 src/{ripple/test => test/support}/jtx/rate.h  |   2 +-
 .../test => test/support}/jtx/regkey.h        |   4 +-
 .../test => test/support}/jtx/require.h       |   2 +-
 .../test => test/support}/jtx/requires.h      |   0
 .../test => test/support}/jtx/sendmax.h       |   2 +-
 src/{ripple/test => test/support}/jtx/seq.h   |   4 +-
 src/{ripple/test => test/support}/jtx/sig.h   |   2 +-
 src/{ripple/test => test/support}/jtx/tag.h   |   2 +-
 src/{ripple/test => test/support}/jtx/tags.h  |   0
 src/{ripple/test => test/support}/jtx/ter.h   |   2 +-
 .../test => test/support}/jtx/ticket.h        |   6 +-
 src/{ripple/test => test/support}/jtx/trust.h |   2 +-
 .../test => test/support}/jtx/txflags.h       |   2 +-
 .../test => test/support}/jtx/utility.h       |   2 +-
 src/{ripple/test => test/support}/mao.h       |   2 +-
 src/{ripple/test => test/support}/mao/Net.h   |   0
 .../test => test/support}/mao/impl/Net.cpp    |   2 +-
 src/{ => test}/unity/app_test_unity.cpp       |   0
 src/{ => test}/unity/basics_test_unity.cpp    |   0
 src/{ => test}/unity/beast_test_unity.cpp     |   0
 .../unity/conditions_test_unity.cpp           |   0
 src/{ => test}/unity/core_test_unity.cpp      |   0
 src/{ => test}/unity/json_test_unity.cpp      |   0
 src/{ => test}/unity/ledger_test_unity.cpp    |   0
 src/{ => test}/unity/nodestore_test_unity.cpp |   0
 src/{ => test}/unity/overlay_test_unity.cpp   |   0
 .../unity/peerfinder_test_unity.cpp           |   0
 src/{ => test}/unity/protocol_test_unity.cpp  |   0
 src/{ => test}/unity/resource_test_unity.cpp  |   0
 src/{ => test}/unity/rpc_test_unity.cpp       |   0
 src/{ => test}/unity/server_test_unity.cpp    |   0
 src/{ => test}/unity/shamap_test_unity.cpp    |   0
 src/test/unity/support_unity.cpp              |  55 ++
 src/unity/test_unity.cpp                      |  22 -
 175 files changed, 851 insertions(+), 921 deletions(-)
 delete mode 100644 src/ripple/basics/impl/TestSuite.test.cpp
 delete mode 100644 src/ripple/unity/test.cpp
 rename src/{ripple/rpc/tests/TestOutputSuite.test.h => test/json/TestOutputSuite.h} (96%)
 rename src/{ripple/nodestore/tests/Base.test.h => test/nodestore/TestBase.h} (100%)
 rename src/{ripple/shamap/tests => test/shamap}/common.h (100%)
 rename src/{ripple/test => test/support}/AbstractClient.h (100%)
 rename src/{ripple/test => test/support}/BasicNetwork.h (100%)
 rename src/test/{ => support}/BasicNetwork_test.cpp (99%)
 rename src/test/{ => support}/Env_test.cpp (99%)
 rename src/{ripple/test => test/support}/JSONRPCClient.h (97%)
 rename src/{ripple/test => test/support}/ManualTimeKeeper.h (100%)
 rename src/{ripple/ledger/tests => test/support}/PathSet.h (99%)
 rename src/{ripple/basics => test/support}/TestSuite.h (100%)
 rename src/{ripple/test => test/support}/WSClient.h (97%)
 rename src/test/{ => support}/WSClient_test.cpp (96%)
 rename src/{ripple/test => test/support}/impl/JSONRPCClient.cpp (99%)
 rename src/{ripple/test => test/support}/impl/ManualTimeKeeper.cpp (98%)
 rename src/{ripple/test => test/support}/impl/WSClient.cpp (99%)
 rename src/{ripple/test => test/support}/jtx.h (50%)
 rename src/{ripple/test => test/support}/jtx/Account.h (100%)
 rename src/{ripple/test => test/support}/jtx/Env.h (98%)
 rename src/{ripple/test => test/support}/jtx/Env_ss.h (98%)
 rename src/{ripple/test => test/support}/jtx/JTx.h (98%)
 rename src/{ripple/test => test/support}/jtx/amount.h (98%)
 rename src/{ripple/test => test/support}/jtx/balance.h (96%)
 rename src/{ripple/test => test/support}/jtx/basic_prop.h (100%)
 rename src/{ripple/test => test/support}/jtx/delivermin.h (97%)
 rename src/{ripple/test => test/support}/jtx/fee.h (96%)
 rename src/{ripple/test => test/support}/jtx/flags.h (99%)
 rename src/{ripple/test => test/support}/jtx/impl/Account.cpp (97%)
 rename src/{ripple/test => test/support}/jtx/impl/Env.cpp (97%)
 rename src/{ripple/test => test/support}/jtx/impl/amount.cpp (97%)
 rename src/{ripple/test => test/support}/jtx/impl/balance.cpp (98%)
 rename src/{ripple/test => test/support}/jtx/impl/delivermin.cpp (96%)
 rename src/{ripple/test => test/support}/jtx/impl/fee.cpp (97%)
 rename src/{ripple/test => test/support}/jtx/impl/flags.cpp (98%)
 rename src/{ripple/test => test/support}/jtx/impl/jtx_json.cpp (95%)
 rename src/{ripple/test => test/support}/jtx/impl/memo.cpp (98%)
 rename src/{ripple/test => test/support}/jtx/impl/multisign.cpp (97%)
 rename src/{ripple/test => test/support}/jtx/impl/offer.cpp (97%)
 rename src/{ripple/test => test/support}/jtx/impl/owners.cpp (98%)
 rename src/{ripple/test => test/support}/jtx/impl/paths.cpp (98%)
 rename src/{ripple/test => test/support}/jtx/impl/pay.cpp (97%)
 rename src/{ripple/test => test/support}/jtx/impl/quality2.cpp (98%)
 rename src/{ripple/test => test/support}/jtx/impl/rate.cpp (97%)
 rename src/{ripple/test => test/support}/jtx/impl/regkey.cpp (97%)
 rename src/{ripple/test => test/support}/jtx/impl/sendmax.cpp (97%)
 rename src/{ripple/test => test/support}/jtx/impl/seq.cpp (97%)
 rename src/{ripple/test => test/support}/jtx/impl/sig.cpp (95%)
 rename src/{ripple/test => test/support}/jtx/impl/tag.cpp (97%)
 rename src/{ripple/test => test/support}/jtx/impl/ticket.cpp (98%)
 rename src/{ripple/test => test/support}/jtx/impl/trust.cpp (98%)
 rename src/{ripple/test => test/support}/jtx/impl/txflags.cpp (97%)
 rename src/{ripple/test => test/support}/jtx/impl/utility.cpp (98%)
 rename src/{ripple/test => test/support}/jtx/jtx_json.h (98%)
 rename src/{ripple/test => test/support}/jtx/memo.h (98%)
 rename src/{ripple/test => test/support}/jtx/multisign.h (96%)
 rename src/{ripple/test => test/support}/jtx/noop.h (97%)
 rename src/{ripple/test => test/support}/jtx/offer.h (97%)
 rename src/{ripple/test => test/support}/jtx/owners.h (98%)
 rename src/{ripple/test => test/support}/jtx/paths.h (98%)
 rename src/{ripple/test => test/support}/jtx/pay.h (94%)
 rename src/{ripple/test => test/support}/jtx/prop.h (97%)
 rename src/{ripple/test => test/support}/jtx/quality.h (98%)
 rename src/{ripple/test => test/support}/jtx/rate.h (97%)
 rename src/{ripple/test => test/support}/jtx/regkey.h (95%)
 rename src/{ripple/test => test/support}/jtx/require.h (98%)
 rename src/{ripple/test => test/support}/jtx/requires.h (100%)
 rename src/{ripple/test => test/support}/jtx/sendmax.h (97%)
 rename src/{ripple/test => test/support}/jtx/seq.h (95%)
 rename src/{ripple/test => test/support}/jtx/sig.h (98%)
 rename src/{ripple/test => test/support}/jtx/tag.h (98%)
 rename src/{ripple/test => test/support}/jtx/tags.h (100%)
 rename src/{ripple/test => test/support}/jtx/ter.h (97%)
 rename src/{ripple/test => test/support}/jtx/ticket.h (96%)
 rename src/{ripple/test => test/support}/jtx/trust.h (97%)
 rename src/{ripple/test => test/support}/jtx/txflags.h (97%)
 rename src/{ripple/test => test/support}/jtx/utility.h (98%)
 rename src/{ripple/test => test/support}/mao.h (97%)
 rename src/{ripple/test => test/support}/mao/Net.h (100%)
 rename src/{ripple/test => test/support}/mao/impl/Net.cpp (97%)
 rename src/{ => test}/unity/app_test_unity.cpp (100%)
 rename src/{ => test}/unity/basics_test_unity.cpp (100%)
 rename src/{ => test}/unity/beast_test_unity.cpp (100%)
 rename src/{ => test}/unity/conditions_test_unity.cpp (100%)
 rename src/{ => test}/unity/core_test_unity.cpp (100%)
 rename src/{ => test}/unity/json_test_unity.cpp (100%)
 rename src/{ => test}/unity/ledger_test_unity.cpp (100%)
 rename src/{ => test}/unity/nodestore_test_unity.cpp (100%)
 rename src/{ => test}/unity/overlay_test_unity.cpp (100%)
 rename src/{ => test}/unity/peerfinder_test_unity.cpp (100%)
 rename src/{ => test}/unity/protocol_test_unity.cpp (100%)
 rename src/{ => test}/unity/resource_test_unity.cpp (100%)
 rename src/{ => test}/unity/rpc_test_unity.cpp (100%)
 rename src/{ => test}/unity/server_test_unity.cpp (100%)
 rename src/{ => test}/unity/shamap_test_unity.cpp (100%)
 create mode 100644 src/test/unity/support_unity.cpp
 delete mode 100644 src/unity/test_unity.cpp

diff --git a/Builds/VisualStudio2015/RippleD.vcxproj b/Builds/VisualStudio2015/RippleD.vcxproj
index 97fe3685472..a2df62585b7 100644
--- a/Builds/VisualStudio2015/RippleD.vcxproj
+++ b/Builds/VisualStudio2015/RippleD.vcxproj
@@ -1411,10 +1411,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\ripple\basics\impl\TestSuite.test.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\src\ripple\basics\impl\ThreadName.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
@@ -1463,8 +1459,6 @@
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\basics\TaggedCache.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\basics\TestSuite.h">
-    </ClInclude>
     <ClInclude Include="..\..\src\ripple\basics\ThreadName.h">
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\basics\ToString.h">
@@ -2114,8 +2108,6 @@
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\ledger\Sandbox.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\ledger\tests\PathSet.h">
-    </ClInclude>
     <ClInclude Include="..\..\src\ripple\ledger\TxMeta.h">
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\ledger\View.h">
@@ -2258,8 +2250,6 @@
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\nodestore\Task.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\nodestore\tests\Base.test.h">
-    </ClInclude>
     <ClInclude Include="..\..\src\ripple\nodestore\Types.h">
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\overlay\Cluster.h">
@@ -3040,8 +3030,6 @@
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\rpc\Status.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\rpc\tests\TestOutputSuite.test.h">
-    </ClInclude>
     <ClInclude Include="..\..\src\ripple\server\Handoff.h">
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\server\impl\BaseHTTPPeer.h">
@@ -3132,208 +3120,8 @@
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\shamap\SHAMapTreeNode.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\shamap\tests\common.h">
-    </ClInclude>
     <ClInclude Include="..\..\src\ripple\shamap\TreeNodeCache.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\AbstractClient.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\BasicNetwork.h">
-    </ClInclude>
-    <ClCompile Include="..\..\src\ripple\test\impl\JSONRPCClient.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\impl\ManualTimeKeeper.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\impl\WSClient.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\test\JSONRPCClient.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\Account.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\amount.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\balance.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\basic_prop.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\delivermin.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\Env.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\Env_ss.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\fee.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\flags.h">
-    </ClInclude>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\Account.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\amount.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\balance.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\delivermin.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\Env.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\fee.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\flags.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\jtx_json.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\memo.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\multisign.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\offer.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\owners.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\paths.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\pay.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\quality2.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\rate.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\regkey.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\sendmax.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\seq.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\sig.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\tag.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\ticket.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\trust.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\txflags.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\utility.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\test\jtx\JTx.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\jtx_json.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\memo.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\multisign.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\noop.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\offer.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\owners.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\paths.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\pay.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\prop.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\quality.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\rate.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\regkey.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\require.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\requires.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\sendmax.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\seq.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\sig.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\tag.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\tags.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\ter.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\ticket.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\trust.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\txflags.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\utility.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\ManualTimeKeeper.h">
-    </ClInclude>
-    <ClCompile Include="..\..\src\ripple\test\mao\impl\Net.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\test\mao\Net.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\WSClient.h">
-    </ClInclude>
     <ClCompile Include="..\..\src\ripple\unity\app_ledger.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug.classic|x64'">True</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release.classic|x64'">True</ExcludedFromBuild>
@@ -3460,10 +3248,6 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='debug|x64'">..\..\src\soci\include\private;..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='release|x64'">..\..\src\soci\include\private;..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
-    <ClCompile Include="..\..\src\ripple\unity\test.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug.classic|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release.classic|x64'">True</ExcludedFromBuild>
-    </ClCompile>
     <ClInclude Include="..\..\src\ripple\websocket\AutoSocket.h">
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\websocket\MakeServer.h">
@@ -4448,10 +4232,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\test\BasicNetwork_test.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\src\test\basics\base_uint_test.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
@@ -4557,16 +4337,20 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\test\conditions\Ed25519_test.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\test\conditions\PrefixSha256_test.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\test\conditions\PreimageSha256_test.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\test\conditions\RsaSha256_test.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\test\core\Config_test.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
@@ -4592,10 +4376,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\test\Env_test.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\src\test\json\json_value_test.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
@@ -4608,6 +4388,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
     </ClCompile>
+    <ClInclude Include="..\..\src\test\json\TestOutputSuite.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\test\json\Writer_test.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
@@ -4664,6 +4446,8 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='debug.classic|x64'">..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='release.classic|x64'">..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
+    <ClInclude Include="..\..\src\test\nodestore\TestBase.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\test\nodestore\Timing_test.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
@@ -4844,6 +4628,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
     </ClCompile>
+    <ClInclude Include="..\..\src\test\shamap\common.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\test\shamap\FetchPack_test.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
@@ -4856,73 +4642,283 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\test\WSClient_test.cpp">
+    <ClInclude Include="..\..\src\test\support\AbstractClient.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\BasicNetwork.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\test\support\BasicNetwork_test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\Env_test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\impl\JSONRPCClient.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\impl\ManualTimeKeeper.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\impl\WSClient.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\test\support\JSONRPCClient.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\Account.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\amount.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\balance.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\basic_prop.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\delivermin.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\Env.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\Env_ss.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\fee.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\flags.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\Account.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\amount.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\balance.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\delivermin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\Env.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\fee.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\flags.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\jtx_json.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\memo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\multisign.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\offer.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\owners.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\paths.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\pay.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\quality2.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\rate.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\regkey.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\sendmax.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\seq.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\sig.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\tag.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\ticket.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\trust.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\txflags.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\utility.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\test\support\jtx\JTx.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\jtx_json.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\memo.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\multisign.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\noop.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\offer.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\owners.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\paths.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\pay.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\prop.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\quality.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\rate.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\regkey.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\require.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\requires.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\sendmax.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\seq.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\sig.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\tag.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\tags.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\ter.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\ticket.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\trust.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\txflags.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\utility.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\ManualTimeKeeper.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\test\support\mao\impl\Net.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\test\support\mao\Net.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\PathSet.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\TestSuite.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\WSClient.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\test\support\WSClient_test.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\unity\app_test_unity.cpp">
+    <ClCompile Include="..\..\src\test\unity\app_test_unity.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug.classic|x64'">True</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release.classic|x64'">True</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\unity\basics_test_unity.cpp">
+    <ClCompile Include="..\..\src\test\unity\basics_test_unity.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug.classic|x64'">True</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release.classic|x64'">True</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\unity\beast_test_unity.cpp">
+    <ClCompile Include="..\..\src\test\unity\beast_test_unity.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug.classic|x64'">True</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release.classic|x64'">True</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\unity\conditions_test_unity.cpp">
+    <ClCompile Include="..\..\src\test\unity\conditions_test_unity.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug.classic|x64'">True</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release.classic|x64'">True</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\unity\core_test_unity.cpp">
+    <ClCompile Include="..\..\src\test\unity\core_test_unity.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug.classic|x64'">True</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release.classic|x64'">True</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\unity\json_test_unity.cpp">
+    <ClCompile Include="..\..\src\test\unity\json_test_unity.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug.classic|x64'">True</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release.classic|x64'">True</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\unity\ledger_test_unity.cpp">
+    <ClCompile Include="..\..\src\test\unity\ledger_test_unity.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug.classic|x64'">True</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release.classic|x64'">True</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\unity\nodestore_test_unity.cpp">
+    <ClCompile Include="..\..\src\test\unity\nodestore_test_unity.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug.classic|x64'">True</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release.classic|x64'">True</ExcludedFromBuild>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='debug|x64'">..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='release|x64'">..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
-    <ClCompile Include="..\..\src\unity\overlay_test_unity.cpp">
+    <ClCompile Include="..\..\src\test\unity\overlay_test_unity.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug.classic|x64'">True</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release.classic|x64'">True</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\unity\peerfinder_test_unity.cpp">
+    <ClCompile Include="..\..\src\test\unity\peerfinder_test_unity.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug.classic|x64'">True</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release.classic|x64'">True</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\unity\protocol_test_unity.cpp">
+    <ClCompile Include="..\..\src\test\unity\protocol_test_unity.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug.classic|x64'">True</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release.classic|x64'">True</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\unity\resource_test_unity.cpp">
+    <ClCompile Include="..\..\src\test\unity\resource_test_unity.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug.classic|x64'">True</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release.classic|x64'">True</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\unity\rpc_test_unity.cpp">
+    <ClCompile Include="..\..\src\test\unity\rpc_test_unity.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug.classic|x64'">True</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release.classic|x64'">True</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\unity\server_test_unity.cpp">
+    <ClCompile Include="..\..\src\test\unity\server_test_unity.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug.classic|x64'">True</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release.classic|x64'">True</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\unity\shamap_test_unity.cpp">
+    <ClCompile Include="..\..\src\test\unity\shamap_test_unity.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug.classic|x64'">True</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release.classic|x64'">True</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\unity\test_unity.cpp">
+    <ClCompile Include="..\..\src\test\unity\support_unity.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug.classic|x64'">True</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release.classic|x64'">True</ExcludedFromBuild>
     </ClCompile>
diff --git a/Builds/VisualStudio2015/RippleD.vcxproj.filters b/Builds/VisualStudio2015/RippleD.vcxproj.filters
index f7bf7fa95d7..83195129445 100644
--- a/Builds/VisualStudio2015/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2015/RippleD.vcxproj.filters
@@ -229,9 +229,6 @@
     <Filter Include="ripple\ledger\impl">
       <UniqueIdentifier>{EA35E0D0-6876-9DC8-10FA-1E6A0486C574}</UniqueIdentifier>
     </Filter>
-    <Filter Include="ripple\ledger\tests">
-      <UniqueIdentifier>{D5A85FA6-148D-DA25-5DAA-C59504C18F26}</UniqueIdentifier>
-    </Filter>
     <Filter Include="ripple\net">
       <UniqueIdentifier>{6649BD29-BE86-723F-501A-045E39310112}</UniqueIdentifier>
     </Filter>
@@ -247,9 +244,6 @@
     <Filter Include="ripple\nodestore\impl">
       <UniqueIdentifier>{9D691DE1-17A1-5989-3E2E-F69B3E43152F}</UniqueIdentifier>
     </Filter>
-    <Filter Include="ripple\nodestore\tests">
-      <UniqueIdentifier>{3FDC73B9-A9C7-3533-FD40-E4032B9FA9FB}</UniqueIdentifier>
-    </Filter>
     <Filter Include="ripple\overlay">
       <UniqueIdentifier>{51E817F6-DC2E-045A-9009-37E3D16D0990}</UniqueIdentifier>
     </Filter>
@@ -289,9 +283,6 @@
     <Filter Include="ripple\rpc\impl">
       <UniqueIdentifier>{93AC3675-D183-4DB4-021E-8F4CA1586866}</UniqueIdentifier>
     </Filter>
-    <Filter Include="ripple\rpc\tests">
-      <UniqueIdentifier>{84FF17C5-6A81-FF13-548E-59940FE0060E}</UniqueIdentifier>
-    </Filter>
     <Filter Include="ripple\server">
       <UniqueIdentifier>{8A61DBF7-69CB-9043-8312-D44C40EC6AE9}</UniqueIdentifier>
     </Filter>
@@ -304,27 +295,6 @@
     <Filter Include="ripple\shamap\impl">
       <UniqueIdentifier>{92AC870A-6B4B-9CD5-4F7F-648C72CFA0D3}</UniqueIdentifier>
     </Filter>
-    <Filter Include="ripple\shamap\tests">
-      <UniqueIdentifier>{F0AEA72D-7030-C8C7-1E34-1029BBD56886}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ripple\test">
-      <UniqueIdentifier>{B25F5854-84AE-1CBD-DFFC-6515DD055652}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ripple\test\impl">
-      <UniqueIdentifier>{CF7F0C3F-3D61-7764-BA8B-5FF38018425C}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ripple\test\jtx">
-      <UniqueIdentifier>{A21A3B94-5C44-3746-4F10-6FF8FF990CE3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ripple\test\jtx\impl">
-      <UniqueIdentifier>{27D70888-7145-691C-0E0A-E511EB3A80A2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ripple\test\mao">
-      <UniqueIdentifier>{94B5035A-6D4A-E4FC-DB50-E7E804DC9F13}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ripple\test\mao\impl">
-      <UniqueIdentifier>{23DE6C05-81D2-7471-D9BB-3AA1D49DE429}</UniqueIdentifier>
-    </Filter>
     <Filter Include="ripple\unity">
       <UniqueIdentifier>{5DB3CD0B-B361-B301-9562-697CA8A52B68}</UniqueIdentifier>
     </Filter>
@@ -493,8 +463,26 @@
     <Filter Include="test\shamap">
       <UniqueIdentifier>{2E37F2EA-49FC-1F02-C3EA-D7EB608603A1}</UniqueIdentifier>
     </Filter>
-    <Filter Include="unity">
-      <UniqueIdentifier>{82E1AA93-0E6B-39FA-4212-EB820AD49028}</UniqueIdentifier>
+    <Filter Include="test\support">
+      <UniqueIdentifier>{EAFC737C-277F-7D41-3A99-8B752EB7D534}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="test\support\impl">
+      <UniqueIdentifier>{3195322A-2CFC-904C-A6AA-1B60F8E5490D}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="test\support\jtx">
+      <UniqueIdentifier>{E6B36A4D-232C-FA63-7B5A-24ADE91F0F32}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="test\support\jtx\impl">
+      <UniqueIdentifier>{F9870E4C-E01C-B734-1475-92401F8766BF}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="test\support\mao">
+      <UniqueIdentifier>{52F836F7-261B-9EA5-8DC4-02E4B010F4D3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="test\support\mao\impl">
+      <UniqueIdentifier>{2AB83499-A4F2-EDED-BC79-6DC296EE9D8A}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="test\unity">
+      <UniqueIdentifier>{4FD99791-5191-0BFF-8D77-19500238E44E}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -1911,9 +1899,6 @@
     <ClCompile Include="..\..\src\ripple\basics\impl\Sustain.cpp">
       <Filter>ripple\basics\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\ripple\basics\impl\TestSuite.test.cpp">
-      <Filter>ripple\basics\impl</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\ripple\basics\impl\ThreadName.cpp">
       <Filter>ripple\basics\impl</Filter>
     </ClCompile>
@@ -1977,9 +1962,6 @@
     <ClInclude Include="..\..\src\ripple\basics\TaggedCache.h">
       <Filter>ripple\basics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\basics\TestSuite.h">
-      <Filter>ripple\basics</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\ripple\basics\ThreadName.h">
       <Filter>ripple\basics</Filter>
     </ClInclude>
@@ -2703,9 +2685,6 @@
     <ClInclude Include="..\..\src\ripple\ledger\Sandbox.h">
       <Filter>ripple\ledger</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\ledger\tests\PathSet.h">
-      <Filter>ripple\ledger\tests</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\ripple\ledger\TxMeta.h">
       <Filter>ripple\ledger</Filter>
     </ClInclude>
@@ -2832,9 +2811,6 @@
     <ClInclude Include="..\..\src\ripple\nodestore\Task.h">
       <Filter>ripple\nodestore</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\nodestore\tests\Base.test.h">
-      <Filter>ripple\nodestore\tests</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\ripple\nodestore\Types.h">
       <Filter>ripple\nodestore</Filter>
     </ClInclude>
@@ -3603,9 +3579,6 @@
     <ClInclude Include="..\..\src\ripple\rpc\Status.h">
       <Filter>ripple\rpc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\rpc\tests\TestOutputSuite.test.h">
-      <Filter>ripple\rpc\tests</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\ripple\server\Handoff.h">
       <Filter>ripple\server</Filter>
     </ClInclude>
@@ -3714,222 +3687,9 @@
     <ClInclude Include="..\..\src\ripple\shamap\SHAMapTreeNode.h">
       <Filter>ripple\shamap</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\shamap\tests\common.h">
-      <Filter>ripple\shamap\tests</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\ripple\shamap\TreeNodeCache.h">
       <Filter>ripple\shamap</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\AbstractClient.h">
-      <Filter>ripple\test</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\BasicNetwork.h">
-      <Filter>ripple\test</Filter>
-    </ClInclude>
-    <ClCompile Include="..\..\src\ripple\test\impl\JSONRPCClient.cpp">
-      <Filter>ripple\test\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\impl\ManualTimeKeeper.cpp">
-      <Filter>ripple\test\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\impl\WSClient.cpp">
-      <Filter>ripple\test\impl</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\test\JSONRPCClient.h">
-      <Filter>ripple\test</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx.h">
-      <Filter>ripple\test</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\Account.h">
-      <Filter>ripple\test\jtx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\amount.h">
-      <Filter>ripple\test\jtx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\balance.h">
-      <Filter>ripple\test\jtx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\basic_prop.h">
-      <Filter>ripple\test\jtx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\delivermin.h">
-      <Filter>ripple\test\jtx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\Env.h">
-      <Filter>ripple\test\jtx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\Env_ss.h">
-      <Filter>ripple\test\jtx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\fee.h">
-      <Filter>ripple\test\jtx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\flags.h">
-      <Filter>ripple\test\jtx</Filter>
-    </ClInclude>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\Account.cpp">
-      <Filter>ripple\test\jtx\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\amount.cpp">
-      <Filter>ripple\test\jtx\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\balance.cpp">
-      <Filter>ripple\test\jtx\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\delivermin.cpp">
-      <Filter>ripple\test\jtx\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\Env.cpp">
-      <Filter>ripple\test\jtx\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\fee.cpp">
-      <Filter>ripple\test\jtx\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\flags.cpp">
-      <Filter>ripple\test\jtx\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\jtx_json.cpp">
-      <Filter>ripple\test\jtx\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\memo.cpp">
-      <Filter>ripple\test\jtx\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\multisign.cpp">
-      <Filter>ripple\test\jtx\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\offer.cpp">
-      <Filter>ripple\test\jtx\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\owners.cpp">
-      <Filter>ripple\test\jtx\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\paths.cpp">
-      <Filter>ripple\test\jtx\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\pay.cpp">
-      <Filter>ripple\test\jtx\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\quality2.cpp">
-      <Filter>ripple\test\jtx\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\rate.cpp">
-      <Filter>ripple\test\jtx\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\regkey.cpp">
-      <Filter>ripple\test\jtx\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\sendmax.cpp">
-      <Filter>ripple\test\jtx\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\seq.cpp">
-      <Filter>ripple\test\jtx\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\sig.cpp">
-      <Filter>ripple\test\jtx\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\tag.cpp">
-      <Filter>ripple\test\jtx\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\ticket.cpp">
-      <Filter>ripple\test\jtx\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\trust.cpp">
-      <Filter>ripple\test\jtx\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\txflags.cpp">
-      <Filter>ripple\test\jtx\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\utility.cpp">
-      <Filter>ripple\test\jtx\impl</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\test\jtx\JTx.h">
-      <Filter>ripple\test\jtx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\jtx_json.h">
-      <Filter>ripple\test\jtx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\memo.h">
-      <Filter>ripple\test\jtx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\multisign.h">
-      <Filter>ripple\test\jtx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\noop.h">
-      <Filter>ripple\test\jtx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\offer.h">
-      <Filter>ripple\test\jtx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\owners.h">
-      <Filter>ripple\test\jtx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\paths.h">
-      <Filter>ripple\test\jtx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\pay.h">
-      <Filter>ripple\test\jtx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\prop.h">
-      <Filter>ripple\test\jtx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\quality.h">
-      <Filter>ripple\test\jtx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\rate.h">
-      <Filter>ripple\test\jtx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\regkey.h">
-      <Filter>ripple\test\jtx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\require.h">
-      <Filter>ripple\test\jtx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\requires.h">
-      <Filter>ripple\test\jtx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\sendmax.h">
-      <Filter>ripple\test\jtx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\seq.h">
-      <Filter>ripple\test\jtx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\sig.h">
-      <Filter>ripple\test\jtx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\tag.h">
-      <Filter>ripple\test\jtx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\tags.h">
-      <Filter>ripple\test\jtx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\ter.h">
-      <Filter>ripple\test\jtx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\ticket.h">
-      <Filter>ripple\test\jtx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\trust.h">
-      <Filter>ripple\test\jtx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\txflags.h">
-      <Filter>ripple\test\jtx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\utility.h">
-      <Filter>ripple\test\jtx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\ManualTimeKeeper.h">
-      <Filter>ripple\test</Filter>
-    </ClInclude>
-    <ClCompile Include="..\..\src\ripple\test\mao\impl\Net.cpp">
-      <Filter>ripple\test\mao\impl</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\test\mao\Net.h">
-      <Filter>ripple\test\mao</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\WSClient.h">
-      <Filter>ripple\test</Filter>
-    </ClInclude>
     <ClCompile Include="..\..\src\ripple\unity\app_ledger.cpp">
       <Filter>ripple\unity</Filter>
     </ClCompile>
@@ -4023,9 +3783,6 @@
     <ClCompile Include="..\..\src\ripple\unity\soci_ripple.cpp">
       <Filter>ripple\unity</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\ripple\unity\test.cpp">
-      <Filter>ripple\unity</Filter>
-    </ClCompile>
     <ClInclude Include="..\..\src\ripple\websocket\AutoSocket.h">
       <Filter>ripple\websocket</Filter>
     </ClInclude>
@@ -5214,9 +4971,6 @@
     <ClCompile Include="..\..\src\test\app\ValidatorList_test.cpp">
       <Filter>test\app</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\test\BasicNetwork_test.cpp">
-      <Filter>test</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\test\basics\base_uint_test.cpp">
       <Filter>test\basics</Filter>
     </ClCompile>
@@ -5325,9 +5079,6 @@
     <ClCompile Include="..\..\src\test\core\Workers_test.cpp">
       <Filter>test\core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\test\Env_test.cpp">
-      <Filter>test</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\test\json\json_value_test.cpp">
       <Filter>test\json</Filter>
     </ClCompile>
@@ -5337,6 +5088,9 @@
     <ClCompile Include="..\..\src\test\json\Output_test.cpp">
       <Filter>test\json</Filter>
     </ClCompile>
+    <ClInclude Include="..\..\src\test\json\TestOutputSuite.h">
+      <Filter>test\json</Filter>
+    </ClInclude>
     <ClCompile Include="..\..\src\test\json\Writer_test.cpp">
       <Filter>test\json</Filter>
     </ClCompile>
@@ -5373,6 +5127,9 @@
     <ClCompile Include="..\..\src\test\nodestore\import_test.cpp">
       <Filter>test\nodestore</Filter>
     </ClCompile>
+    <ClInclude Include="..\..\src\test\nodestore\TestBase.h">
+      <Filter>test\nodestore</Filter>
+    </ClInclude>
     <ClCompile Include="..\..\src\test\nodestore\Timing_test.cpp">
       <Filter>test\nodestore</Filter>
     </ClCompile>
@@ -5505,6 +5262,9 @@
     <ClCompile Include="..\..\src\test\server\Server_test.cpp">
       <Filter>test\server</Filter>
     </ClCompile>
+    <ClInclude Include="..\..\src\test\shamap\common.h">
+      <Filter>test\shamap</Filter>
+    </ClInclude>
     <ClCompile Include="..\..\src\test\shamap\FetchPack_test.cpp">
       <Filter>test\shamap</Filter>
     </ClCompile>
@@ -5514,56 +5274,278 @@
     <ClCompile Include="..\..\src\test\shamap\SHAMap_test.cpp">
       <Filter>test\shamap</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\test\WSClient_test.cpp">
-      <Filter>test</Filter>
+    <ClInclude Include="..\..\src\test\support\AbstractClient.h">
+      <Filter>test\support</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\BasicNetwork.h">
+      <Filter>test\support</Filter>
+    </ClInclude>
+    <ClCompile Include="..\..\src\test\support\BasicNetwork_test.cpp">
+      <Filter>test\support</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\Env_test.cpp">
+      <Filter>test\support</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\impl\JSONRPCClient.cpp">
+      <Filter>test\support\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\impl\ManualTimeKeeper.cpp">
+      <Filter>test\support\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\impl\WSClient.cpp">
+      <Filter>test\support\impl</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\test\support\JSONRPCClient.h">
+      <Filter>test\support</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx.h">
+      <Filter>test\support</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\Account.h">
+      <Filter>test\support\jtx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\amount.h">
+      <Filter>test\support\jtx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\balance.h">
+      <Filter>test\support\jtx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\basic_prop.h">
+      <Filter>test\support\jtx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\delivermin.h">
+      <Filter>test\support\jtx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\Env.h">
+      <Filter>test\support\jtx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\Env_ss.h">
+      <Filter>test\support\jtx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\fee.h">
+      <Filter>test\support\jtx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\flags.h">
+      <Filter>test\support\jtx</Filter>
+    </ClInclude>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\Account.cpp">
+      <Filter>test\support\jtx\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\amount.cpp">
+      <Filter>test\support\jtx\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\balance.cpp">
+      <Filter>test\support\jtx\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\delivermin.cpp">
+      <Filter>test\support\jtx\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\Env.cpp">
+      <Filter>test\support\jtx\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\fee.cpp">
+      <Filter>test\support\jtx\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\flags.cpp">
+      <Filter>test\support\jtx\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\jtx_json.cpp">
+      <Filter>test\support\jtx\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\memo.cpp">
+      <Filter>test\support\jtx\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\multisign.cpp">
+      <Filter>test\support\jtx\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\offer.cpp">
+      <Filter>test\support\jtx\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\owners.cpp">
+      <Filter>test\support\jtx\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\paths.cpp">
+      <Filter>test\support\jtx\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\pay.cpp">
+      <Filter>test\support\jtx\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\quality2.cpp">
+      <Filter>test\support\jtx\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\rate.cpp">
+      <Filter>test\support\jtx\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\regkey.cpp">
+      <Filter>test\support\jtx\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\sendmax.cpp">
+      <Filter>test\support\jtx\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\seq.cpp">
+      <Filter>test\support\jtx\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\sig.cpp">
+      <Filter>test\support\jtx\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\tag.cpp">
+      <Filter>test\support\jtx\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\ticket.cpp">
+      <Filter>test\support\jtx\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\trust.cpp">
+      <Filter>test\support\jtx\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\txflags.cpp">
+      <Filter>test\support\jtx\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\support\jtx\impl\utility.cpp">
+      <Filter>test\support\jtx\impl</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\test\support\jtx\JTx.h">
+      <Filter>test\support\jtx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\jtx_json.h">
+      <Filter>test\support\jtx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\memo.h">
+      <Filter>test\support\jtx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\multisign.h">
+      <Filter>test\support\jtx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\noop.h">
+      <Filter>test\support\jtx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\offer.h">
+      <Filter>test\support\jtx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\owners.h">
+      <Filter>test\support\jtx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\paths.h">
+      <Filter>test\support\jtx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\pay.h">
+      <Filter>test\support\jtx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\prop.h">
+      <Filter>test\support\jtx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\quality.h">
+      <Filter>test\support\jtx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\rate.h">
+      <Filter>test\support\jtx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\regkey.h">
+      <Filter>test\support\jtx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\require.h">
+      <Filter>test\support\jtx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\requires.h">
+      <Filter>test\support\jtx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\sendmax.h">
+      <Filter>test\support\jtx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\seq.h">
+      <Filter>test\support\jtx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\sig.h">
+      <Filter>test\support\jtx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\tag.h">
+      <Filter>test\support\jtx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\tags.h">
+      <Filter>test\support\jtx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\ter.h">
+      <Filter>test\support\jtx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\ticket.h">
+      <Filter>test\support\jtx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\trust.h">
+      <Filter>test\support\jtx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\txflags.h">
+      <Filter>test\support\jtx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\jtx\utility.h">
+      <Filter>test\support\jtx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\ManualTimeKeeper.h">
+      <Filter>test\support</Filter>
+    </ClInclude>
+    <ClCompile Include="..\..\src\test\support\mao\impl\Net.cpp">
+      <Filter>test\support\mao\impl</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\test\support\mao\Net.h">
+      <Filter>test\support\mao</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\PathSet.h">
+      <Filter>test\support</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\TestSuite.h">
+      <Filter>test\support</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\test\support\WSClient.h">
+      <Filter>test\support</Filter>
+    </ClInclude>
+    <ClCompile Include="..\..\src\test\support\WSClient_test.cpp">
+      <Filter>test\support</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\unity\app_test_unity.cpp">
-      <Filter>unity</Filter>
+    <ClCompile Include="..\..\src\test\unity\app_test_unity.cpp">
+      <Filter>test\unity</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\unity\basics_test_unity.cpp">
-      <Filter>unity</Filter>
+    <ClCompile Include="..\..\src\test\unity\basics_test_unity.cpp">
+      <Filter>test\unity</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\unity\beast_test_unity.cpp">
-      <Filter>unity</Filter>
+    <ClCompile Include="..\..\src\test\unity\beast_test_unity.cpp">
+      <Filter>test\unity</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\unity\conditions_test_unity.cpp">
-      <Filter>unity</Filter>
+    <ClCompile Include="..\..\src\test\unity\conditions_test_unity.cpp">
+      <Filter>test\unity</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\unity\core_test_unity.cpp">
-      <Filter>unity</Filter>
+    <ClCompile Include="..\..\src\test\unity\core_test_unity.cpp">
+      <Filter>test\unity</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\unity\json_test_unity.cpp">
-      <Filter>unity</Filter>
+    <ClCompile Include="..\..\src\test\unity\json_test_unity.cpp">
+      <Filter>test\unity</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\unity\ledger_test_unity.cpp">
-      <Filter>unity</Filter>
+    <ClCompile Include="..\..\src\test\unity\ledger_test_unity.cpp">
+      <Filter>test\unity</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\unity\nodestore_test_unity.cpp">
-      <Filter>unity</Filter>
+    <ClCompile Include="..\..\src\test\unity\nodestore_test_unity.cpp">
+      <Filter>test\unity</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\unity\overlay_test_unity.cpp">
-      <Filter>unity</Filter>
+    <ClCompile Include="..\..\src\test\unity\overlay_test_unity.cpp">
+      <Filter>test\unity</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\unity\peerfinder_test_unity.cpp">
-      <Filter>unity</Filter>
+    <ClCompile Include="..\..\src\test\unity\peerfinder_test_unity.cpp">
+      <Filter>test\unity</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\unity\protocol_test_unity.cpp">
-      <Filter>unity</Filter>
+    <ClCompile Include="..\..\src\test\unity\protocol_test_unity.cpp">
+      <Filter>test\unity</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\unity\resource_test_unity.cpp">
-      <Filter>unity</Filter>
+    <ClCompile Include="..\..\src\test\unity\resource_test_unity.cpp">
+      <Filter>test\unity</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\unity\rpc_test_unity.cpp">
-      <Filter>unity</Filter>
+    <ClCompile Include="..\..\src\test\unity\rpc_test_unity.cpp">
+      <Filter>test\unity</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\unity\server_test_unity.cpp">
-      <Filter>unity</Filter>
+    <ClCompile Include="..\..\src\test\unity\server_test_unity.cpp">
+      <Filter>test\unity</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\unity\shamap_test_unity.cpp">
-      <Filter>unity</Filter>
+    <ClCompile Include="..\..\src\test\unity\shamap_test_unity.cpp">
+      <Filter>test\unity</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\unity\test_unity.cpp">
-      <Filter>unity</Filter>
+    <ClCompile Include="..\..\src\test\unity\support_unity.cpp">
+      <Filter>test\unity</Filter>
     </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7a48d69e941..89780725d28 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -195,11 +195,10 @@ json.cpp
 protocol.cpp
 rpcx.cpp
 shamap.cpp
-server.cpp
-test.cpp)
+server.cpp)
 
 prepend(test_unity_srcs
-src/unity/
+src/test/unity/
 app_test_unity.cpp
 basics_test_unity.cpp
 beast_test_unity.cpp
@@ -214,11 +213,11 @@ resource_test_unity.cpp
 rpc_test_unity.cpp
 server_test_unity.cpp
 shamap_test_unity.cpp
-test_unity.cpp)
+support_unity.cpp)
 
 list(APPEND rippled_src_unity ${beast_unity_srcs} ${ripple_unity_srcs} ${test_unity_srcs})
 
-add_with_props(rippled_src_unity src/unity/nodestore_test_unity.cpp
+add_with_props(rippled_src_unity src/test/unity/nodestore_test_unity.cpp
 -I"${CMAKE_SOURCE_DIR}/"src/rocksdb2/include
 -I"${CMAKE_SOURCE_DIR}/"src/snappy/snappy
 -I"${CMAKE_SOURCE_DIR}/"src/snappy/config
@@ -235,7 +234,7 @@ add_with_props(rippled_src_unity src/ripple/unity/soci_ripple.cpp ${soci_extra_i
 list(APPEND ripple_unity_srcs ${beast_unity_srcs} ${test_unity_srcs}
 src/ripple/unity/nodestore.cpp
 src/ripple/unity/soci_ripple.cpp
-src/unity/nodestore_test_unity.cpp)
+src/test/unity/nodestore_test_unity.cpp)
 
 ############################################################
 
@@ -266,8 +265,7 @@ foreach(curdir
         protocol
         rpc
         server
-        shamap
-        test)
+        shamap)
     file(GLOB_RECURSE cursrcs src/ripple/${curdir}/*.cpp)
     list(APPEND rippled_src_nonunity "${cursrcs}")
     list(APPEND non_unity_srcs "${cursrcs}")
@@ -284,7 +282,28 @@ add_with_props(rippled_src_nonunity "${nodestore_srcs}"
 
 list(APPEND non_unity_srcs "${nodestore_srcs}")
 
-file(GLOB_RECURSE test_srcs src/test/*.cpp)
+# unit test sources
+foreach(curdir
+        app
+        basics
+        beast
+        conditions
+        core
+        json
+        ledger
+        nodestore
+        overlay
+        peerfinder
+        protocol
+        resource
+        rpc
+        server
+        shamap
+        support)
+    file(GLOB_RECURSE cursrcs src/test/${curdir}/*.cpp)
+    list(APPEND test_srcs "${cursrcs}")
+endforeach()
+
 add_with_props(rippled_src_nonunity "${test_srcs}"
     -I"${CMAKE_SOURCE_DIR}/"src/rocksdb2/include
     -I"${CMAKE_SOURCE_DIR}/"src/snappy/snappy
diff --git a/SConstruct b/SConstruct
index c45fe3dc0fc..724ec2b471b 100644
--- a/SConstruct
+++ b/SConstruct
@@ -949,14 +949,10 @@ def get_classic_sources(toolchain):
     append_sources(result, *list_sources('src/ripple/rpc', '.cpp'))
     append_sources(result, *list_sources('src/ripple/shamap', '.cpp'))
     append_sources(result, *list_sources('src/ripple/server', '.cpp'))
-    append_sources(result, *list_sources('src/ripple/test', '.cpp'))
-    append_sources(result, 
-        'src/test/BasicNetwork_test.cpp',
-        'src/test/Env_test.cpp',
-        'src/test/WSClient_test.cpp')
     append_sources(result, *list_sources('src/test/app', '.cpp'))
     append_sources(result, *list_sources('src/test/basics', '.cpp'))
     append_sources(result, *list_sources('src/test/beast', '.cpp'))
+    append_sources(result, *list_sources('src/test/conditions', '.cpp'))
     append_sources(result, *list_sources('src/test/core', '.cpp'))
     append_sources(result, *list_sources('src/test/json', '.cpp'))
     append_sources(result, *list_sources('src/test/ledger', '.cpp'))
@@ -967,6 +963,8 @@ def get_classic_sources(toolchain):
     append_sources(result, *list_sources('src/test/rpc', '.cpp'))
     append_sources(result, *list_sources('src/test/server', '.cpp'))
     append_sources(result, *list_sources('src/test/shamap', '.cpp'))
+    append_sources(result, *list_sources('src/test/support', '.cpp'))
+
     
     if use_shp(toolchain):
         cc_flags = {'CCFLAGS': ['--system-header-prefix=rocksdb2']}
@@ -1013,22 +1011,21 @@ def get_unity_sources(toolchain):
         'src/ripple/unity/rpcx.cpp',
         'src/ripple/unity/shamap.cpp',
         'src/ripple/unity/server.cpp',
-        'src/ripple/unity/test.cpp',
-        'src/unity/app_test_unity.cpp',
-        'src/unity/basics_test_unity.cpp',
-        'src/unity/beast_test_unity.cpp',
-        'src/unity/core_test_unity.cpp',
-        'src/unity/conditions_test_unity.cpp',
-        'src/unity/json_test_unity.cpp',
-        'src/unity/ledger_test_unity.cpp',
-        'src/unity/overlay_test_unity.cpp',
-        'src/unity/peerfinder_test_unity.cpp',
-        'src/unity/protocol_test_unity.cpp',
-        'src/unity/resource_test_unity.cpp',
-        'src/unity/rpc_test_unity.cpp',
-        'src/unity/server_test_unity.cpp',
-        'src/unity/shamap_test_unity.cpp',
-        'src/unity/test_unity.cpp'
+        'src/test/unity/app_test_unity.cpp',
+        'src/test/unity/basics_test_unity.cpp',
+        'src/test/unity/beast_test_unity.cpp',
+        'src/test/unity/core_test_unity.cpp',
+        'src/test/unity/conditions_test_unity.cpp',
+        'src/test/unity/json_test_unity.cpp',
+        'src/test/unity/ledger_test_unity.cpp',
+        'src/test/unity/overlay_test_unity.cpp',
+        'src/test/unity/peerfinder_test_unity.cpp',
+        'src/test/unity/protocol_test_unity.cpp',
+        'src/test/unity/resource_test_unity.cpp',
+        'src/test/unity/rpc_test_unity.cpp',
+        'src/test/unity/server_test_unity.cpp',
+        'src/test/unity/shamap_test_unity.cpp',
+        'src/test/unity/support_unity.cpp'
     )
 
     if use_shp(toolchain):
@@ -1039,7 +1036,7 @@ def get_unity_sources(toolchain):
     append_sources(
         result,
         'src/ripple/unity/nodestore.cpp',
-        'src/unity/nodestore_test_unity.cpp',
+        'src/test/unity/nodestore_test_unity.cpp',
         CPPPATH=[
             'src/rocksdb2/include',
             'src/snappy/snappy',
@@ -1274,10 +1271,10 @@ def do_count(target, source, env):
                     path = os.path.join(parent, path)
                     r = os.path.splitext(path)
                     if r[1] in suffixes:
-                        if r[0].endswith('.test'):
+                        if r[0].endswith('_test'):
                             yield os.path.normpath(path)
         return list(_iter(base))
-    testfiles = list_testfiles(os.path.join('src', 'ripple'), env.get('CPPSUFFIXES'))
+    testfiles = list_testfiles(os.path.join('src', 'test'), env.get('CPPSUFFIXES'))
     lines = 0
     for f in testfiles:
         lines = lines + sum(1 for line in open(f))
diff --git a/bin/ci/ubuntu/build-and-test.sh b/bin/ci/ubuntu/build-and-test.sh
index ab101260dcb..09e69bed68d 100755
--- a/bin/ci/ubuntu/build-and-test.sh
+++ b/bin/ci/ubuntu/build-and-test.sh
@@ -46,8 +46,8 @@ if [[ ${APP} == "rippled" ]]; then
   export APP_ARGS="--unittest"
   # Only report on src/ripple files
   export LCOV_FILES="*/src/ripple/*"
-  # Exclude */src/ripple/test directory
-  export LCOV_EXCLUDE_FILES="*/src/ripple/test/*"
+  # Nothing to explicitly exclude
+  export LCOV_EXCLUDE_FILES="LCOV_NO_EXCLUDE"
 else
   : ${APP_ARGS:=}
   : ${LCOV_FILES:="*/src/*"}
diff --git a/src/ripple/app/ledger/Ledger.cpp b/src/ripple/app/ledger/Ledger.cpp
index f97a7da6f12..ba921ecea49 100644
--- a/src/ripple/app/ledger/Ledger.cpp
+++ b/src/ripple/app/ledger/Ledger.cpp
@@ -48,7 +48,6 @@
 #include <ripple/protocol/HashPrefix.h>
 #include <ripple/protocol/types.h>
 #include <ripple/beast/core/LexicalCast.h>
-#include <ripple/beast/unit_test.h>
 #include <boost/optional.hpp>
 #include <cassert>
 #include <utility>
diff --git a/src/ripple/app/main/Main.cpp b/src/ripple/app/main/Main.cpp
index 647dad504ec..6ad534b40cd 100644
--- a/src/ripple/app/main/Main.cpp
+++ b/src/ripple/app/main/Main.cpp
@@ -38,9 +38,11 @@
 #include <ripple/protocol/BuildInfo.h>
 #include <ripple/beast/clock/basic_seconds_clock.h>
 #include <ripple/beast/core/Time.h>
-#include <ripple/beast/unit_test.h>
 #include <ripple/beast/utility/Debug.h>
 #include <beast/unit_test/dstream.hpp>
+#include <beast/unit_test/global_suites.hpp>
+#include <beast/unit_test/match.hpp>
+#include <beast/unit_test/reporter.hpp>
 #include <google/protobuf/stubs/common.h>
 #include <boost/program_options.hpp>
 #include <cstdlib>
diff --git a/src/ripple/basics/impl/CheckLibraryVersions.cpp b/src/ripple/basics/impl/CheckLibraryVersions.cpp
index 5009ccdfd16..b4268ba7855 100644
--- a/src/ripple/basics/impl/CheckLibraryVersions.cpp
+++ b/src/ripple/basics/impl/CheckLibraryVersions.cpp
@@ -20,7 +20,6 @@
 #include <BeastConfig.h>
 #include <ripple/basics/contract.h>
 #include <ripple/basics/impl/CheckLibraryVersionsImpl.h>
-#include <ripple/beast/unit_test.h>
 #include <ripple/beast/core/SemanticVersion.h>
 #include <boost/version.hpp>
 #include <openssl/opensslv.h>
diff --git a/src/ripple/basics/impl/RangeSet.cpp b/src/ripple/basics/impl/RangeSet.cpp
index ffd3bdd85bc..ed13d5349e4 100644
--- a/src/ripple/basics/impl/RangeSet.cpp
+++ b/src/ripple/basics/impl/RangeSet.cpp
@@ -20,7 +20,6 @@
 #include <BeastConfig.h>
 #include <ripple/basics/Log.h>
 #include <ripple/basics/RangeSet.h>
-#include <ripple/beast/unit_test.h>
 #include <ripple/beast/core/LexicalCast.h>
 #include <boost/foreach.hpp>
 #include <cassert>
diff --git a/src/ripple/basics/impl/StringUtilities.cpp b/src/ripple/basics/impl/StringUtilities.cpp
index 44f115fdbfe..6de1bb03d51 100644
--- a/src/ripple/basics/impl/StringUtilities.cpp
+++ b/src/ripple/basics/impl/StringUtilities.cpp
@@ -23,7 +23,6 @@
 #include <ripple/basics/StringUtilities.h>
 #include <ripple/basics/ToString.h>
 #include <ripple/beast/core/LexicalCast.h>
-#include <ripple/beast/unit_test.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/asio/ip/address.hpp>
 #include <boost/regex.hpp>
diff --git a/src/ripple/basics/impl/TestSuite.test.cpp b/src/ripple/basics/impl/TestSuite.test.cpp
deleted file mode 100644
index 741680b5355..00000000000
--- a/src/ripple/basics/impl/TestSuite.test.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of rippled: https://github.com/ripple/rippled
-    Copyright (c) 2012, 2013 Ripple Labs Inc.
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#include <ripple/basics/TestSuite.h>
-#include <vector>
-
-namespace ripple {
-
-struct TestSuite_test : TestSuite
-{
-    void run() override
-    {
-        expectEquals (2, 2, "this won't get printed.");
-        using Vec = std::vector<std::string>;
-        Vec v1{"hello", "world"};
-        Vec v2{"hello", "world"};
-        expectCollectionEquals (v1, v2, "this won't get printed.");
-
-        // TODO(tom): how to test failure?
-    }
-};
-
-} // ripple
diff --git a/src/ripple/json/impl/Writer.cpp b/src/ripple/json/impl/Writer.cpp
index 9a8a47d83dd..5b2f1f6105b 100644
--- a/src/ripple/json/impl/Writer.cpp
+++ b/src/ripple/json/impl/Writer.cpp
@@ -20,8 +20,8 @@
 #include <BeastConfig.h>
 #include <ripple/json/Output.h>
 #include <ripple/json/Writer.h>
-#include <ripple/beast/unit_test.h>
 #include <stack>
+#include <set>
 
 namespace Json {
 
diff --git a/src/ripple/protocol/impl/BuildInfo.cpp b/src/ripple/protocol/impl/BuildInfo.cpp
index 23ae1f39424..d5a5a8095e6 100644
--- a/src/ripple/protocol/impl/BuildInfo.cpp
+++ b/src/ripple/protocol/impl/BuildInfo.cpp
@@ -19,7 +19,6 @@
 
 #include <BeastConfig.h>
 #include <ripple/basics/contract.h>
-#include <ripple/beast/unit_test.h>
 #include <ripple/beast/core/SemanticVersion.h>
 #include <ripple/protocol/BuildInfo.h>
 
diff --git a/src/ripple/protocol/impl/STTx.cpp b/src/ripple/protocol/impl/STTx.cpp
index 4aea634ebd2..3a92127e1b4 100644
--- a/src/ripple/protocol/impl/STTx.cpp
+++ b/src/ripple/protocol/impl/STTx.cpp
@@ -32,7 +32,6 @@
 #include <ripple/basics/Log.h>
 #include <ripple/basics/StringUtilities.h>
 #include <ripple/json/to_string.h>
-#include <ripple/beast/unit_test.h>
 #include <boost/format.hpp>
 #include <array>
 #include <memory>
diff --git a/src/ripple/shamap/impl/SHAMap.cpp b/src/ripple/shamap/impl/SHAMap.cpp
index c329b78d632..4a28da6119c 100644
--- a/src/ripple/shamap/impl/SHAMap.cpp
+++ b/src/ripple/shamap/impl/SHAMap.cpp
@@ -20,7 +20,6 @@
 #include <BeastConfig.h>
 #include <ripple/basics/contract.h>
 #include <ripple/shamap/SHAMap.h>
-#include <ripple/beast/unit_test.h>
 
 namespace ripple {
 
diff --git a/src/ripple/shamap/impl/SHAMapSync.cpp b/src/ripple/shamap/impl/SHAMapSync.cpp
index 669d868a2b7..313ed90578f 100644
--- a/src/ripple/shamap/impl/SHAMapSync.cpp
+++ b/src/ripple/shamap/impl/SHAMapSync.cpp
@@ -21,7 +21,6 @@
 #include <ripple/basics/random.h>
 #include <ripple/shamap/SHAMap.h>
 #include <ripple/nodestore/Database.h>
-#include <ripple/beast/unit_test.h>
 
 namespace ripple {
 
diff --git a/src/ripple/unity/basics.cpp b/src/ripple/unity/basics.cpp
index 561a4c39075..8903eb5b423 100644
--- a/src/ripple/unity/basics.cpp
+++ b/src/ripple/unity/basics.cpp
@@ -31,7 +31,6 @@
 #include <ripple/basics/impl/strHex.cpp>
 #include <ripple/basics/impl/StringUtilities.cpp>
 #include <ripple/basics/impl/Sustain.cpp>
-#include <ripple/basics/impl/TestSuite.test.cpp>
 #include <ripple/basics/impl/ThreadName.cpp>
 #include <ripple/basics/impl/Time.cpp>
 #include <ripple/basics/impl/UptimeTimer.cpp>
diff --git a/src/ripple/unity/test.cpp b/src/ripple/unity/test.cpp
deleted file mode 100644
index 8168d5b9c3e..00000000000
--- a/src/ripple/unity/test.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of rippled: https://github.com/ripple/rippled
-    Copyright (c) 2012, 2013 Ripple Labs Inc.
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#include <BeastConfig.h>
-
-#include <ripple/test/jtx/impl/Account.cpp>
-#include <ripple/test/jtx/impl/amount.cpp>
-#include <ripple/test/jtx/impl/balance.cpp>
-#include <ripple/test/jtx/impl/delivermin.cpp>
-#include <ripple/test/jtx/impl/Env.cpp>
-#include <ripple/test/jtx/impl/fee.cpp>
-#include <ripple/test/jtx/impl/flags.cpp>
-#include <ripple/test/jtx/impl/jtx_json.cpp>
-#include <ripple/test/jtx/impl/memo.cpp>
-#include <ripple/test/jtx/impl/multisign.cpp>
-#include <ripple/test/jtx/impl/offer.cpp>
-#include <ripple/test/jtx/impl/owners.cpp>
-#include <ripple/test/jtx/impl/paths.cpp>
-#include <ripple/test/jtx/impl/pay.cpp>
-#include <ripple/test/jtx/impl/quality2.cpp>
-#include <ripple/test/jtx/impl/rate.cpp>
-#include <ripple/test/jtx/impl/regkey.cpp>
-#include <ripple/test/jtx/impl/sendmax.cpp>
-#include <ripple/test/jtx/impl/seq.cpp>
-#include <ripple/test/jtx/impl/sig.cpp>
-#include <ripple/test/jtx/impl/tag.cpp>
-#include <ripple/test/jtx/impl/ticket.cpp>
-#include <ripple/test/jtx/impl/trust.cpp>
-#include <ripple/test/jtx/impl/txflags.cpp>
-#include <ripple/test/jtx/impl/utility.cpp>
-
-#include <ripple/test/mao/impl/Net.cpp>
-#include <ripple/test/impl/JSONRPCClient.cpp>
-#include <ripple/test/impl/ManualTimeKeeper.cpp>
-#include <ripple/test/impl/WSClient.cpp>
diff --git a/src/test/app/AccountTxPaging_test.cpp b/src/test/app/AccountTxPaging_test.cpp
index 0a744deab9f..dc166222331 100644
--- a/src/test/app/AccountTxPaging_test.cpp
+++ b/src/test/app/AccountTxPaging_test.cpp
@@ -19,7 +19,7 @@
 #include <ripple/core/DatabaseCon.h>
 #include <ripple/app/misc/impl/AccountTxPaging.h>
 #include <ripple/protocol/types.h>
-#include <ripple/test/jtx.h>
+#include <test/support/jtx.h>
 #include <ripple/beast/unit_test.h>
 #include <cstdlib>
 #include <memory>
diff --git a/src/test/app/CrossingLimits_test.cpp b/src/test/app/CrossingLimits_test.cpp
index e33f520ad82..5b1590886d0 100644
--- a/src/test/app/CrossingLimits_test.cpp
+++ b/src/test/app/CrossingLimits_test.cpp
@@ -16,7 +16,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx.h>
+#include <test/support/jtx.h>
 #include <ripple/beast/unit_test.h>
 
 namespace ripple {
diff --git a/src/test/app/DeliverMin_test.cpp b/src/test/app/DeliverMin_test.cpp
index bb74ea290c7..c38bef053ac 100644
--- a/src/test/app/DeliverMin_test.cpp
+++ b/src/test/app/DeliverMin_test.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx.h>
+#include <test/support/jtx.h>
 #include <ripple/beast/unit_test.h>
 
 namespace ripple {
diff --git a/src/test/app/Discrepancy_test.cpp b/src/test/app/Discrepancy_test.cpp
index cff6c5952dc..470334ee2ba 100644
--- a/src/test/app/Discrepancy_test.cpp
+++ b/src/test/app/Discrepancy_test.cpp
@@ -18,8 +18,8 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx.h>
-#include <ripple/test/jtx/Env.h>
+#include <test/support/jtx.h>
+#include <test/support/jtx/Env.h>
 #include <ripple/beast/unit_test.h>
 #include <ripple/beast/core/LexicalCast.h>
 #include <ripple/protocol/JsonFields.h>
diff --git a/src/test/app/Flow_test.cpp b/src/test/app/Flow_test.cpp
index 0b5e49291fa..0f42a6d4c91 100644
--- a/src/test/app/Flow_test.cpp
+++ b/src/test/app/Flow_test.cpp
@@ -16,14 +16,14 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx.h>
+#include <test/support/jtx.h>
 #include <ripple/app/paths/Flow.h>
 #include <ripple/app/paths/impl/Steps.h>
 #include <ripple/basics/contract.h>
 #include <ripple/core/Config.h>
 #include <ripple/ledger/PaymentSandbox.h>
 #include <ripple/ledger/Sandbox.h>
-#include <ripple/ledger/tests/PathSet.h>
+#include <test/support/PathSet.h>
 #include <ripple/protocol/Feature.h>
 #include <ripple/protocol/JsonFields.h>
 namespace ripple {
diff --git a/src/test/app/Freeze_test.cpp b/src/test/app/Freeze_test.cpp
index b80ad285264..6c4b0ad333f 100644
--- a/src/test/app/Freeze_test.cpp
+++ b/src/test/app/Freeze_test.cpp
@@ -16,7 +16,7 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
-#include <ripple/test/jtx.h>
+#include <test/support/jtx.h>
 #include <ripple/protocol/TxFlags.h>
 #include <ripple/protocol/JsonFields.h>
 #include <ripple/protocol/SField.h>
diff --git a/src/test/app/MultiSign_test.cpp b/src/test/app/MultiSign_test.cpp
index 8ef4c3b6b3d..28c092f5ee3 100644
--- a/src/test/app/MultiSign_test.cpp
+++ b/src/test/app/MultiSign_test.cpp
@@ -18,7 +18,7 @@
 #include <BeastConfig.h>
 #include <ripple/protocol/JsonFields.h>     // jss:: definitions
 #include <ripple/protocol/Feature.h>
-#include <ripple/test/jtx.h>
+#include <test/support/jtx.h>
 
 namespace ripple {
 namespace test {
diff --git a/src/test/app/Offer_test.cpp b/src/test/app/Offer_test.cpp
index bed3530872d..53b24b9ffd6 100644
--- a/src/test/app/Offer_test.cpp
+++ b/src/test/app/Offer_test.cpp
@@ -18,9 +18,9 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx.h>
-#include <ripple/test/WSClient.h>
-#include <ripple/ledger/tests/PathSet.h>
+#include <test/support/jtx.h>
+#include <test/support/WSClient.h>
+#include <test/support/PathSet.h>
 #include <ripple/protocol/Feature.h>
 #include <ripple/protocol/JsonFields.h>
 #include <ripple/protocol/Quality.h>
diff --git a/src/test/app/OversizeMeta_test.cpp b/src/test/app/OversizeMeta_test.cpp
index 7a5998e7926..f3b5e0e3a02 100644
--- a/src/test/app/OversizeMeta_test.cpp
+++ b/src/test/app/OversizeMeta_test.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx.h>
+#include <test/support/jtx.h>
 #include <ripple/beast/unit_test.h>
 #include <algorithm>
 
diff --git a/src/test/app/Path_test.cpp b/src/test/app/Path_test.cpp
index a391203903f..9682f77543a 100644
--- a/src/test/app/Path_test.cpp
+++ b/src/test/app/Path_test.cpp
@@ -30,7 +30,7 @@
 #include <ripple/rpc/Context.h>
 #include <ripple/rpc/impl/Tuning.h>
 #include <ripple/rpc/RPCHandler.h>
-#include <ripple/test/jtx.h>
+#include <test/support/jtx.h>
 #include <ripple/beast/unit_test.h>
 #include <chrono>
 #include <condition_variable>
diff --git a/src/test/app/PayChan_test.cpp b/src/test/app/PayChan_test.cpp
index d9b667c3ce1..69b3ba42116 100644
--- a/src/test/app/PayChan_test.cpp
+++ b/src/test/app/PayChan_test.cpp
@@ -24,7 +24,7 @@
 #include <ripple/protocol/JsonFields.h>
 #include <ripple/protocol/PayChan.h>
 #include <ripple/protocol/TxFlags.h>
-#include <ripple/test/jtx.h>
+#include <test/support/jtx.h>
 
 #include <chrono>
 
diff --git a/src/test/app/Regression_test.cpp b/src/test/app/Regression_test.cpp
index 116783a882b..c06769eb426 100644
--- a/src/test/app/Regression_test.cpp
+++ b/src/test/app/Regression_test.cpp
@@ -16,7 +16,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx.h>
+#include <test/support/jtx.h>
 #include <ripple/app/tx/apply.h>
 #include <ripple/basics/StringUtilities.h>
 #include <ripple/json/json_reader.h>
diff --git a/src/test/app/SHAMapStore_test.cpp b/src/test/app/SHAMapStore_test.cpp
index fb9b485fd7d..6db40a4dc30 100644
--- a/src/test/app/SHAMapStore_test.cpp
+++ b/src/test/app/SHAMapStore_test.cpp
@@ -24,7 +24,7 @@
 #include <ripple/core/DatabaseCon.h>
 #include <ripple/core/SociDB.h>
 #include <ripple/protocol/JsonFields.h>
-#include <ripple/test/jtx.h>
+#include <test/support/jtx.h>
 
 namespace ripple {
 namespace test {
diff --git a/src/test/app/SetAuth_test.cpp b/src/test/app/SetAuth_test.cpp
index 57ef5aba409..4374b0638c7 100644
--- a/src/test/app/SetAuth_test.cpp
+++ b/src/test/app/SetAuth_test.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx.h>
+#include <test/support/jtx.h>
 #include <ripple/protocol/Feature.h>
 #include <ripple/protocol/JsonFields.h>
 
diff --git a/src/test/app/SetRegularKey_test.cpp b/src/test/app/SetRegularKey_test.cpp
index 691037bb9c0..1538b331219 100644
--- a/src/test/app/SetRegularKey_test.cpp
+++ b/src/test/app/SetRegularKey_test.cpp
@@ -19,7 +19,7 @@
 
 #include <ripple/protocol/JsonFields.h>
 #include <ripple/protocol/Feature.h>
-#include <ripple/test/jtx.h>
+#include <test/support/jtx.h>
 
 namespace ripple {
 
diff --git a/src/test/app/SetTrust_test.cpp b/src/test/app/SetTrust_test.cpp
index 9eb3667c9ed..c1137a14fce 100644
--- a/src/test/app/SetTrust_test.cpp
+++ b/src/test/app/SetTrust_test.cpp
@@ -16,7 +16,7 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
-#include <ripple/test/jtx.h>
+#include <test/support/jtx.h>
 #include <ripple/protocol/TxFlags.h>
 #include <ripple/protocol/JsonFields.h>
 
diff --git a/src/test/app/SusPay_test.cpp b/src/test/app/SusPay_test.cpp
index efb3488394c..9415904532c 100644
--- a/src/test/app/SusPay_test.cpp
+++ b/src/test/app/SusPay_test.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx.h>
+#include <test/support/jtx.h>
 #include <ripple/app/tx/applySteps.h>
 #include <ripple/protocol/Feature.h>
 #include <ripple/protocol/Indexes.h>
diff --git a/src/test/app/Ticket_test.cpp b/src/test/app/Ticket_test.cpp
index fcacba35a6c..6c8b157c5a3 100644
--- a/src/test/app/Ticket_test.cpp
+++ b/src/test/app/Ticket_test.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx.h>
+#include <test/support/jtx.h>
 #include <ripple/protocol/JsonFields.h>
 #include <ripple/protocol/Feature.h>
 
diff --git a/src/test/app/Transaction_ordering_test.cpp b/src/test/app/Transaction_ordering_test.cpp
index 0d40afc9a06..99c45f802c1 100644
--- a/src/test/app/Transaction_ordering_test.cpp
+++ b/src/test/app/Transaction_ordering_test.cpp
@@ -18,7 +18,7 @@
 #include <BeastConfig.h>
 #include <ripple/core/JobQueue.h>
 #include <ripple/protocol/ErrorCodes.h>
-#include <ripple/test/jtx.h>
+#include <test/support/jtx.h>
 
 namespace ripple {
 namespace test {
diff --git a/src/test/app/TrustAndBalance_test.cpp b/src/test/app/TrustAndBalance_test.cpp
index 7d0071d8518..4e32c55ce3f 100644
--- a/src/test/app/TrustAndBalance_test.cpp
+++ b/src/test/app/TrustAndBalance_test.cpp
@@ -18,11 +18,11 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx.h>
+#include <test/support/jtx.h>
 #include <ripple/beast/unit_test.h>
 #include <ripple/protocol/JsonFields.h>
 #include <ripple/protocol/SField.h>
-#include <ripple/test/WSClient.h>
+#include <test/support/WSClient.h>
 
 namespace ripple {
 
diff --git a/src/test/app/TxQ_test.cpp b/src/test/app/TxQ_test.cpp
index b5e5d46ec50..01cc5bf7fab 100644
--- a/src/test/app/TxQ_test.cpp
+++ b/src/test/app/TxQ_test.cpp
@@ -24,13 +24,13 @@
 #include <ripple/app/tx/apply.h>
 #include <ripple/basics/Log.h>
 #include <ripple/basics/mulDiv.h>
-#include <ripple/basics/TestSuite.h>
+#include <test/support/TestSuite.h>
 #include <ripple/protocol/ErrorCodes.h>
 #include <ripple/protocol/Feature.h>
 #include <ripple/protocol/JsonFields.h>
 #include <ripple/protocol/st.h>
-#include <ripple/test/jtx.h>
-#include <ripple/test/jtx/ticket.h>
+#include <test/support/jtx.h>
+#include <test/support/jtx/ticket.h>
 #include <boost/optional.hpp>
 
 namespace ripple {
diff --git a/src/test/app/ValidatorList_test.cpp b/src/test/app/ValidatorList_test.cpp
index 70f8d5930f4..83589f3e0d9 100644
--- a/src/test/app/ValidatorList_test.cpp
+++ b/src/test/app/ValidatorList_test.cpp
@@ -19,7 +19,7 @@
 
 #include <BeastConfig.h>
 #include <ripple/basics/Slice.h>
-#include <ripple/basics/TestSuite.h>
+#include <test/support/TestSuite.h>
 #include <ripple/app/misc/ValidatorList.h>
 #include <ripple/protocol/SecretKey.h>
 
diff --git a/src/test/core/Config_test.cpp b/src/test/core/Config_test.cpp
index 7b32e88bdfd..ce627b04021 100644
--- a/src/test/core/Config_test.cpp
+++ b/src/test/core/Config_test.cpp
@@ -21,7 +21,7 @@
 #include <ripple/basics/contract.h>
 #include <ripple/core/Config.h>
 #include <ripple/core/ConfigSections.h>
-#include <ripple/basics/TestSuite.h>
+#include <test/support/TestSuite.h>
 #include <boost/filesystem.hpp>
 #include <boost/format.hpp>
 #include <fstream>
diff --git a/src/test/core/Coroutine_test.cpp b/src/test/core/Coroutine_test.cpp
index 05f3cb50494..89858bfae54 100644
--- a/src/test/core/Coroutine_test.cpp
+++ b/src/test/core/Coroutine_test.cpp
@@ -19,7 +19,7 @@
 
 #include <BeastConfig.h>
 #include <ripple/core/JobQueue.h>
-#include <ripple/test/jtx.h>
+#include <test/support/jtx.h>
 #include <chrono>
 #include <condition_variable>
 #include <mutex>
diff --git a/src/test/core/SociDB_test.cpp b/src/test/core/SociDB_test.cpp
index fe44b46b55f..d8d4661c50f 100644
--- a/src/test/core/SociDB_test.cpp
+++ b/src/test/core/SociDB_test.cpp
@@ -22,7 +22,7 @@
 #include <ripple/core/ConfigSections.h>
 #include <ripple/core/SociDB.h>
 #include <ripple/basics/contract.h>
-#include <ripple/basics/TestSuite.h>
+#include <test/support/TestSuite.h>
 #include <ripple/basics/BasicConfig.h>
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
diff --git a/src/test/json/Object_test.cpp b/src/test/json/Object_test.cpp
index c9b5845e27f..7292247315c 100644
--- a/src/test/json/Object_test.cpp
+++ b/src/test/json/Object_test.cpp
@@ -19,12 +19,12 @@
 
 #include <BeastConfig.h>
 #include <ripple/json/Object.h>
-#include <ripple/rpc/tests/TestOutputSuite.test.h>
+#include <test/json/TestOutputSuite.h>
 #include <ripple/beast/unit_test.h>
 
 namespace Json {
 
-class JsonObject_test : public ripple::RPC::TestOutputSuite
+class JsonObject_test : public ripple::test::TestOutputSuite
 {
     void setup (std::string const& testName)
     {
diff --git a/src/test/json/Output_test.cpp b/src/test/json/Output_test.cpp
index 6d22472f116..6adf2fb24af 100644
--- a/src/test/json/Output_test.cpp
+++ b/src/test/json/Output_test.cpp
@@ -20,11 +20,11 @@
 #include <BeastConfig.h>
 #include <ripple/json/json_reader.h>
 #include <ripple/json/json_writer.h>
-#include <ripple/rpc/tests/TestOutputSuite.test.h>
+#include <test/json/TestOutputSuite.h>
 
 namespace Json {
 
-struct Output_test : ripple::RPC::TestOutputSuite
+struct Output_test : ripple::test::TestOutputSuite
 {
     void runTest (std::string const& name, std::string const& valueDesc)
     {
diff --git a/src/ripple/rpc/tests/TestOutputSuite.test.h b/src/test/json/TestOutputSuite.h
similarity index 96%
rename from src/ripple/rpc/tests/TestOutputSuite.test.h
rename to src/test/json/TestOutputSuite.h
index ef4c561ffe3..3efa9a8d502 100644
--- a/src/ripple/rpc/tests/TestOutputSuite.test.h
+++ b/src/test/json/TestOutputSuite.h
@@ -22,10 +22,10 @@
 
 #include <ripple/json/Output.h>
 #include <ripple/json/Writer.h>
-#include <ripple/basics/TestSuite.h>
+#include <test/support/TestSuite.h>
 
 namespace ripple {
-namespace RPC {
+namespace test {
 
 class TestOutputSuite : public TestSuite
 {
@@ -51,7 +51,7 @@ class TestOutputSuite : public TestSuite
     }
 };
 
-} // RPC
+} // test
 } // ripple
 
 #endif
diff --git a/src/test/json/Writer_test.cpp b/src/test/json/Writer_test.cpp
index 6f6f7722021..80159208ae3 100644
--- a/src/test/json/Writer_test.cpp
+++ b/src/test/json/Writer_test.cpp
@@ -20,12 +20,12 @@
 #include <BeastConfig.h>
 #include <ripple/json/json_writer.h>
 #include <ripple/json/Writer.h>
-#include <ripple/rpc/tests/TestOutputSuite.test.h>
+#include <test/json/TestOutputSuite.h>
 #include <ripple/beast/unit_test.h>
 
 namespace Json {
 
-class JsonWriter_test : public ripple::RPC::TestOutputSuite
+class JsonWriter_test : public ripple::test::TestOutputSuite
 {
 public:
     void testTrivial ()
diff --git a/src/test/ledger/BookDirs_test.cpp b/src/test/ledger/BookDirs_test.cpp
index 4decba8bcd1..d00af360a4e 100644
--- a/src/test/ledger/BookDirs_test.cpp
+++ b/src/test/ledger/BookDirs_test.cpp
@@ -16,7 +16,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx.h>
+#include <test/support/jtx.h>
 #include <ripple/ledger/BookDirs.h>
 
 namespace ripple {
diff --git a/src/test/ledger/Directory_test.cpp b/src/test/ledger/Directory_test.cpp
index 75da640a6d9..2511a5cc062 100644
--- a/src/test/ledger/Directory_test.cpp
+++ b/src/test/ledger/Directory_test.cpp
@@ -16,7 +16,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx.h>
+#include <test/support/jtx.h>
 #include <ripple/ledger/Directory.h>
 
 namespace ripple {
diff --git a/src/test/ledger/PaymentSandbox_test.cpp b/src/test/ledger/PaymentSandbox_test.cpp
index 6e1e6bc9132..13171c747e9 100644
--- a/src/test/ledger/PaymentSandbox_test.cpp
+++ b/src/test/ledger/PaymentSandbox_test.cpp
@@ -20,7 +20,7 @@
 #include <BeastConfig.h>
 #include <ripple/ledger/ApplyViewImpl.h>
 #include <ripple/ledger/PaymentSandbox.h>
-#include <ripple/ledger/tests/PathSet.h>
+#include <test/support/PathSet.h>
 #include <ripple/ledger/View.h>
 #include <ripple/protocol/AmountConversions.h>
 
diff --git a/src/test/ledger/SHAMapV2_test.cpp b/src/test/ledger/SHAMapV2_test.cpp
index e3e383fea96..1ebab7b5cd9 100644
--- a/src/test/ledger/SHAMapV2_test.cpp
+++ b/src/test/ledger/SHAMapV2_test.cpp
@@ -19,7 +19,7 @@
 
 #include <BeastConfig.h>
 #include <ripple/app/ledger/Ledger.h>
-#include <ripple/test/jtx.h>
+#include <test/support/jtx.h>
 #include <ripple/beast/unit_test.h>
 
 namespace ripple {
diff --git a/src/test/ledger/SkipList_test.cpp b/src/test/ledger/SkipList_test.cpp
index b225deaef1d..a45ed7ecec7 100644
--- a/src/test/ledger/SkipList_test.cpp
+++ b/src/test/ledger/SkipList_test.cpp
@@ -21,7 +21,7 @@
 #include <ripple/app/ledger/Ledger.h>
 #include <ripple/basics/Log.h>
 #include <ripple/ledger/View.h>
-#include <ripple/test/jtx.h>
+#include <test/support/jtx.h>
 #include <ripple/beast/unit_test.h>
 
 namespace ripple {
diff --git a/src/test/ledger/View_test.cpp b/src/test/ledger/View_test.cpp
index 78171f30d66..24891dc8f19 100644
--- a/src/test/ledger/View_test.cpp
+++ b/src/test/ledger/View_test.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx.h>
+#include <test/support/jtx.h>
 #include <ripple/app/ledger/Ledger.h>
 #include <ripple/ledger/ApplyViewImpl.h>
 #include <ripple/ledger/OpenView.h>
diff --git a/src/test/nodestore/Backend_test.cpp b/src/test/nodestore/Backend_test.cpp
index 45f88ebf4fe..81fa54964ab 100644
--- a/src/test/nodestore/Backend_test.cpp
+++ b/src/test/nodestore/Backend_test.cpp
@@ -19,7 +19,7 @@
 
 #include <BeastConfig.h>
 #include <ripple/unity/rocksdb.h>
-#include <ripple/nodestore/tests/Base.test.h>
+#include <test/nodestore/TestBase.h>
 #include <ripple/nodestore/DummyScheduler.h>
 #include <ripple/nodestore/Manager.h>
 #include <ripple/beast/utility/temp_dir.h>
diff --git a/src/test/nodestore/Basics_test.cpp b/src/test/nodestore/Basics_test.cpp
index 0cdc83a3a58..d361c42a3b2 100644
--- a/src/test/nodestore/Basics_test.cpp
+++ b/src/test/nodestore/Basics_test.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/nodestore/tests/Base.test.h>
+#include <test/nodestore/TestBase.h>
 #include <ripple/nodestore/DummyScheduler.h>
 #include <ripple/nodestore/Manager.h>
 #include <ripple/nodestore/impl/DecodedBlob.h>
diff --git a/src/test/nodestore/Database_test.cpp b/src/test/nodestore/Database_test.cpp
index 8c451908099..01fc86855ef 100644
--- a/src/test/nodestore/Database_test.cpp
+++ b/src/test/nodestore/Database_test.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/nodestore/tests/Base.test.h>
+#include <test/nodestore/TestBase.h>
 #include <ripple/nodestore/DummyScheduler.h>
 #include <ripple/nodestore/Manager.h>
 #include <ripple/beast/utility/temp_dir.h>
diff --git a/src/ripple/nodestore/tests/Base.test.h b/src/test/nodestore/TestBase.h
similarity index 100%
rename from src/ripple/nodestore/tests/Base.test.h
rename to src/test/nodestore/TestBase.h
diff --git a/src/test/nodestore/Timing_test.cpp b/src/test/nodestore/Timing_test.cpp
index 0b6bc02f7d0..d90d8470749 100644
--- a/src/test/nodestore/Timing_test.cpp
+++ b/src/test/nodestore/Timing_test.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/nodestore/tests/Base.test.h>
+#include <test/nodestore/TestBase.h>
 #include <ripple/nodestore/DummyScheduler.h>
 #include <ripple/nodestore/Manager.h>
 #include <ripple/basics/BasicConfig.h>
diff --git a/src/test/overlay/cluster_test.cpp b/src/test/overlay/cluster_test.cpp
index a7e68785e44..43a0cd6622f 100644
--- a/src/test/overlay/cluster_test.cpp
+++ b/src/test/overlay/cluster_test.cpp
@@ -19,7 +19,7 @@
 
 #include <BeastConfig.h>
 #include <ripple/basics/BasicConfig.h>
-#include <ripple/basics/TestSuite.h>
+#include <test/support/TestSuite.h>
 #include <ripple/overlay/Cluster.h>
 #include <ripple/overlay/ClusterNode.h>
 
diff --git a/src/test/overlay/manifest_test.cpp b/src/test/overlay/manifest_test.cpp
index cd6dd80108b..9230e3f5986 100644
--- a/src/test/overlay/manifest_test.cpp
+++ b/src/test/overlay/manifest_test.cpp
@@ -20,7 +20,7 @@
 #include <BeastConfig.h>
 #include <ripple/basics/contract.h>
 #include <ripple/basics/StringUtilities.h>
-#include <ripple/basics/TestSuite.h>
+#include <test/support/TestSuite.h>
 #include <ripple/overlay/impl/Manifest.h>
 #include <ripple/core/DatabaseCon.h>
 #include <ripple/app/main/DBInit.h>
diff --git a/src/test/rpc/AccountInfo_test.cpp b/src/test/rpc/AccountInfo_test.cpp
index 7ab92452970..e456b7fdaa6 100644
--- a/src/test/rpc/AccountInfo_test.cpp
+++ b/src/test/rpc/AccountInfo_test.cpp
@@ -19,7 +19,7 @@
 
 #include <ripple/protocol/JsonFields.h>     // jss:: definitions
 #include <ripple/protocol/Feature.h>
-#include <ripple/test/jtx.h>
+#include <test/support/jtx.h>
 
 namespace ripple {
 namespace test {
diff --git a/src/test/rpc/AccountLinesRPC_test.cpp b/src/test/rpc/AccountLinesRPC_test.cpp
index eb58a94a1a0..8120d47a056 100644
--- a/src/test/rpc/AccountLinesRPC_test.cpp
+++ b/src/test/rpc/AccountLinesRPC_test.cpp
@@ -21,7 +21,7 @@
 #include <ripple/protocol/ErrorCodes.h>
 #include <ripple/protocol/JsonFields.h>
 #include <ripple/protocol/TxFlags.h>
-#include <ripple/test/jtx.h>
+#include <test/support/jtx.h>
 #include <ripple/beast/unit_test.h>
 
 namespace ripple {
diff --git a/src/test/rpc/AccountObjects_test.cpp b/src/test/rpc/AccountObjects_test.cpp
index 2a492e2cb89..7778fc053d4 100644
--- a/src/test/rpc/AccountObjects_test.cpp
+++ b/src/test/rpc/AccountObjects_test.cpp
@@ -21,7 +21,7 @@
 #include <ripple/json/json_value.h>
 #include <ripple/json/to_string.h>
 #include <ripple/json/json_reader.h>
-#include <ripple/test/jtx.h>
+#include <test/support/jtx.h>
 
 #include <boost/utility/string_ref.hpp>
 
diff --git a/src/test/rpc/AccountOffers_test.cpp b/src/test/rpc/AccountOffers_test.cpp
index 40bc492546b..ec82d1617b4 100644
--- a/src/test/rpc/AccountOffers_test.cpp
+++ b/src/test/rpc/AccountOffers_test.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <ripple/protocol/JsonFields.h>
-#include <ripple/test/jtx.h>
+#include <test/support/jtx.h>
 
 namespace ripple {
 namespace test {
diff --git a/src/test/rpc/AccountSet_test.cpp b/src/test/rpc/AccountSet_test.cpp
index 5dc9b4a736c..f84e7eeccae 100644
--- a/src/test/rpc/AccountSet_test.cpp
+++ b/src/test/rpc/AccountSet_test.cpp
@@ -19,7 +19,7 @@
 
 #include <ripple/protocol/JsonFields.h>
 #include <ripple/protocol/Feature.h>
-#include <ripple/test/jtx.h>
+#include <test/support/jtx.h>
 #include <ripple/basics/StringUtilities.h>
 
 namespace ripple {
diff --git a/src/test/rpc/Book_test.cpp b/src/test/rpc/Book_test.cpp
index da9890ade45..9caa2f33fa5 100644
--- a/src/test/rpc/Book_test.cpp
+++ b/src/test/rpc/Book_test.cpp
@@ -18,8 +18,8 @@
 #include <BeastConfig.h>
 #include <ripple/protocol/JsonFields.h>
 #include <ripple/protocol/Indexes.h>
-#include <ripple/test/WSClient.h>
-#include <ripple/test/jtx.h>
+#include <test/support/WSClient.h>
+#include <test/support/jtx.h>
 #include <ripple/beast/unit_test.h>
 #include <ripple/rpc/impl/Tuning.h>
 
diff --git a/src/test/rpc/GatewayBalances_test.cpp b/src/test/rpc/GatewayBalances_test.cpp
index 6f9f4ccc72c..b739d233b9e 100644
--- a/src/test/rpc/GatewayBalances_test.cpp
+++ b/src/test/rpc/GatewayBalances_test.cpp
@@ -17,8 +17,8 @@
 
 #include <BeastConfig.h>
 #include <ripple/protocol/JsonFields.h>
-#include <ripple/test/WSClient.h>
-#include <ripple/test/jtx.h>
+#include <test/support/WSClient.h>
+#include <test/support/jtx.h>
 #include <ripple/beast/unit_test.h>
 
 namespace ripple {
diff --git a/src/test/rpc/JSONRPC_test.cpp b/src/test/rpc/JSONRPC_test.cpp
index 763212ee513..8f1f025d698 100644
--- a/src/test/rpc/JSONRPC_test.cpp
+++ b/src/test/rpc/JSONRPC_test.cpp
@@ -25,7 +25,7 @@
 #include <ripple/protocol/ErrorCodes.h>
 #include <ripple/protocol/Feature.h>
 #include <ripple/rpc/impl/TransactionSign.h>
-#include <ripple/test/jtx.h>
+#include <test/support/jtx.h>
 #include <ripple/beast/unit_test.h>
 
 namespace ripple {
diff --git a/src/test/rpc/KeyGeneration_test.cpp b/src/test/rpc/KeyGeneration_test.cpp
index e170d05a85e..75a9d2bdd9f 100644
--- a/src/test/rpc/KeyGeneration_test.cpp
+++ b/src/test/rpc/KeyGeneration_test.cpp
@@ -19,7 +19,7 @@
 
 #include <BeastConfig.h>
 #include <ripple/basics/StringUtilities.h>
-#include <ripple/basics/TestSuite.h>
+#include <test/support/TestSuite.h>
 #include <ripple/json/json_value.h>
 #include <ripple/json/json_writer.h>
 #include <ripple/protocol/ErrorCodes.h>
diff --git a/src/test/rpc/LedgerClosed_test.cpp b/src/test/rpc/LedgerClosed_test.cpp
index aaad8f32be2..581b74d8553 100644
--- a/src/test/rpc/LedgerClosed_test.cpp
+++ b/src/test/rpc/LedgerClosed_test.cpp
@@ -19,7 +19,7 @@
 
 #include <ripple/protocol/JsonFields.h>
 #include <ripple/protocol/Feature.h>
-#include <ripple/test/jtx.h>
+#include <test/support/jtx.h>
 
 namespace ripple {
 
diff --git a/src/test/rpc/LedgerData_test.cpp b/src/test/rpc/LedgerData_test.cpp
index 8753321fa48..73958f34956 100644
--- a/src/test/rpc/LedgerData_test.cpp
+++ b/src/test/rpc/LedgerData_test.cpp
@@ -19,7 +19,7 @@
 
 #include <ripple/basics/StringUtilities.h>
 #include <ripple/protocol/JsonFields.h>
-#include <ripple/test/jtx.h>
+#include <test/support/jtx.h>
 
 namespace ripple {
 
diff --git a/src/test/rpc/LedgerRPC_test.cpp b/src/test/rpc/LedgerRPC_test.cpp
index 29b05ebc38e..ca780a7cf30 100644
--- a/src/test/rpc/LedgerRPC_test.cpp
+++ b/src/test/rpc/LedgerRPC_test.cpp
@@ -20,7 +20,7 @@
 #include <BeastConfig.h>
 #include <ripple/protocol/ErrorCodes.h>
 #include <ripple/protocol/JsonFields.h>
-#include <ripple/test/jtx.h>
+#include <test/support/jtx.h>
 #include <ripple/beast/unit_test.h>
 
 namespace ripple {
diff --git a/src/test/rpc/LedgerRequestRPC_test.cpp b/src/test/rpc/LedgerRequestRPC_test.cpp
index d7a725a799d..fbc3b910ee5 100644
--- a/src/test/rpc/LedgerRequestRPC_test.cpp
+++ b/src/test/rpc/LedgerRequestRPC_test.cpp
@@ -20,7 +20,7 @@
 #include <BeastConfig.h>
 #include <ripple/protocol/ErrorCodes.h>
 #include <ripple/protocol/JsonFields.h>
-#include <ripple/test/jtx.h>
+#include <test/support/jtx.h>
 #include <ripple/beast/unit_test.h>
 #include <ripple/app/ledger/LedgerMaster.h>
 
diff --git a/src/test/rpc/NoRipple_test.cpp b/src/test/rpc/NoRipple_test.cpp
index 437ad4bce04..9f2e2839ca3 100644
--- a/src/test/rpc/NoRipple_test.cpp
+++ b/src/test/rpc/NoRipple_test.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <ripple/protocol/JsonFields.h>
-#include <ripple/test/jtx.h>
+#include <test/support/jtx.h>
 
 namespace ripple {
 
diff --git a/src/test/rpc/RobustTransaction_test.cpp b/src/test/rpc/RobustTransaction_test.cpp
index b6e6c121069..7942d1c77f0 100644
--- a/src/test/rpc/RobustTransaction_test.cpp
+++ b/src/test/rpc/RobustTransaction_test.cpp
@@ -18,8 +18,8 @@
 #include <BeastConfig.h>
 #include <ripple/core/JobQueue.h>
 #include <ripple/protocol/JsonFields.h>
-#include <ripple/test/jtx.h>
-#include <ripple/test/WSClient.h>
+#include <test/support/jtx.h>
+#include <test/support/WSClient.h>
 #include <ripple/beast/unit_test.h>
 
 namespace ripple {
diff --git a/src/test/rpc/ServerInfo_test.cpp b/src/test/rpc/ServerInfo_test.cpp
index febab8e3130..f1489c2d7fe 100644
--- a/src/test/rpc/ServerInfo_test.cpp
+++ b/src/test/rpc/ServerInfo_test.cpp
@@ -19,7 +19,7 @@
 
 #include <BeastConfig.h>
 #include <ripple/protocol/JsonFields.h>
-#include <ripple/test/jtx.h>
+#include <test/support/jtx.h>
 #include <ripple/beast/unit_test.h>
 
 #include <boost/format.hpp>
diff --git a/src/test/rpc/Subscribe_test.cpp b/src/test/rpc/Subscribe_test.cpp
index e566082cbd2..e2ba3370e04 100644
--- a/src/test/rpc/Subscribe_test.cpp
+++ b/src/test/rpc/Subscribe_test.cpp
@@ -19,8 +19,8 @@
 #include <ripple/app/misc/LoadFeeTrack.h>
 #include <ripple/app/misc/NetworkOPs.h>
 #include <ripple/protocol/JsonFields.h>
-#include <ripple/test/WSClient.h>
-#include <ripple/test/jtx.h>
+#include <test/support/WSClient.h>
+#include <test/support/jtx.h>
 #include <ripple/beast/unit_test.h>
 
 namespace ripple {
diff --git a/src/test/server/ServerStatus_test.cpp b/src/test/server/ServerStatus_test.cpp
index c6e1d3b1c19..ebc81d14dd4 100644
--- a/src/test/server/ServerStatus_test.cpp
+++ b/src/test/server/ServerStatus_test.cpp
@@ -20,9 +20,9 @@
 #include <BeastConfig.h>
 #include <ripple/rpc/ServerHandler.h>
 #include <ripple/json/json_reader.h>
-#include <ripple/test/jtx.h>
-#include <ripple/test/WSClient.h>
-#include <ripple/test/JSONRPCClient.h>
+#include <test/support/jtx.h>
+#include <test/support/WSClient.h>
+#include <test/support/JSONRPCClient.h>
 #include <ripple/core/DeadlineTimer.h>
 #include <beast/core/to_string.hpp>
 #include <beast/http.hpp>
diff --git a/src/test/shamap/FetchPack_test.cpp b/src/test/shamap/FetchPack_test.cpp
index 76f0d3099a6..1ae630cda5a 100644
--- a/src/test/shamap/FetchPack_test.cpp
+++ b/src/test/shamap/FetchPack_test.cpp
@@ -19,7 +19,7 @@
 
 #include <BeastConfig.h>
 #include <ripple/shamap/SHAMap.h>
-#include <ripple/shamap/tests/common.h>
+#include <test/shamap/common.h>
 #include <ripple/protocol/digest.h>
 #include <ripple/basics/contract.h>
 #include <ripple/basics/random.h>
diff --git a/src/test/shamap/SHAMapSync_test.cpp b/src/test/shamap/SHAMapSync_test.cpp
index 5692b0e860f..ced902fcd87 100644
--- a/src/test/shamap/SHAMapSync_test.cpp
+++ b/src/test/shamap/SHAMapSync_test.cpp
@@ -20,7 +20,7 @@
 #include <BeastConfig.h>
 #include <ripple/shamap/SHAMap.h>
 #include <ripple/shamap/SHAMapItem.h>
-#include <ripple/shamap/tests/common.h>
+#include <test/shamap/common.h>
 #include <ripple/basics/random.h>
 #include <ripple/basics/StringUtilities.h>
 #include <ripple/beast/unit_test.h>
diff --git a/src/test/shamap/SHAMap_test.cpp b/src/test/shamap/SHAMap_test.cpp
index 0dedd65755b..bade39e3a8b 100644
--- a/src/test/shamap/SHAMap_test.cpp
+++ b/src/test/shamap/SHAMap_test.cpp
@@ -19,7 +19,7 @@
 
 #include <BeastConfig.h>
 #include <ripple/shamap/SHAMap.h>
-#include <ripple/shamap/tests/common.h>
+#include <test/shamap/common.h>
 #include <ripple/basics/Blob.h>
 #include <ripple/basics/StringUtilities.h>
 #include <ripple/beast/unit_test.h>
diff --git a/src/ripple/shamap/tests/common.h b/src/test/shamap/common.h
similarity index 100%
rename from src/ripple/shamap/tests/common.h
rename to src/test/shamap/common.h
diff --git a/src/ripple/test/AbstractClient.h b/src/test/support/AbstractClient.h
similarity index 100%
rename from src/ripple/test/AbstractClient.h
rename to src/test/support/AbstractClient.h
diff --git a/src/ripple/test/BasicNetwork.h b/src/test/support/BasicNetwork.h
similarity index 100%
rename from src/ripple/test/BasicNetwork.h
rename to src/test/support/BasicNetwork.h
diff --git a/src/test/BasicNetwork_test.cpp b/src/test/support/BasicNetwork_test.cpp
similarity index 99%
rename from src/test/BasicNetwork_test.cpp
rename to src/test/support/BasicNetwork_test.cpp
index 823eccf1409..569a80d8785 100644
--- a/src/test/BasicNetwork_test.cpp
+++ b/src/test/support/BasicNetwork_test.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/BasicNetwork.h>
+#include <test/support/BasicNetwork.h>
 #include <ripple/beast/unit_test.h>
 #include <set>
 #include <vector>
diff --git a/src/test/Env_test.cpp b/src/test/support/Env_test.cpp
similarity index 99%
rename from src/test/Env_test.cpp
rename to src/test/support/Env_test.cpp
index 6d15ff1dcdc..ad7a5414f4a 100644
--- a/src/test/Env_test.cpp
+++ b/src/test/support/Env_test.cpp
@@ -19,7 +19,7 @@
 
 #include <BeastConfig.h>
 #include <ripple/basics/Log.h>
-#include <ripple/test/jtx.h>
+#include <test/support/jtx.h>
 #include <ripple/json/to_string.h>
 #include <ripple/protocol/Feature.h>
 #include <ripple/protocol/JsonFields.h>
diff --git a/src/ripple/test/JSONRPCClient.h b/src/test/support/JSONRPCClient.h
similarity index 97%
rename from src/ripple/test/JSONRPCClient.h
rename to src/test/support/JSONRPCClient.h
index e937c159c4f..b9165a6b450 100644
--- a/src/ripple/test/JSONRPCClient.h
+++ b/src/test/support/JSONRPCClient.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TEST_HTTPCLIENT_H_INCLUDED
 #define RIPPLE_TEST_HTTPCLIENT_H_INCLUDED
 
-#include <ripple/test/AbstractClient.h>
+#include <test/support/AbstractClient.h>
 #include <ripple/core/Config.h>
 #include <memory>
 
diff --git a/src/ripple/test/ManualTimeKeeper.h b/src/test/support/ManualTimeKeeper.h
similarity index 100%
rename from src/ripple/test/ManualTimeKeeper.h
rename to src/test/support/ManualTimeKeeper.h
diff --git a/src/ripple/ledger/tests/PathSet.h b/src/test/support/PathSet.h
similarity index 99%
rename from src/ripple/ledger/tests/PathSet.h
rename to src/test/support/PathSet.h
index 8a9b06c02b0..399c5cb0738 100644
--- a/src/ripple/ledger/tests/PathSet.h
+++ b/src/test/support/PathSet.h
@@ -22,7 +22,7 @@
 
 #include <ripple/basics/Log.h>
 #include <ripple/protocol/TxFlags.h>
-#include <ripple/test/jtx.h>
+#include <test/support/jtx.h>
 
 namespace ripple {
 namespace test {
diff --git a/src/ripple/basics/TestSuite.h b/src/test/support/TestSuite.h
similarity index 100%
rename from src/ripple/basics/TestSuite.h
rename to src/test/support/TestSuite.h
diff --git a/src/ripple/test/WSClient.h b/src/test/support/WSClient.h
similarity index 97%
rename from src/ripple/test/WSClient.h
rename to src/test/support/WSClient.h
index c00de5fd8f3..a870a5ce230 100644
--- a/src/ripple/test/WSClient.h
+++ b/src/test/support/WSClient.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TEST_WSCLIENT_H_INCLUDED
 #define RIPPLE_TEST_WSCLIENT_H_INCLUDED
 
-#include <ripple/test/AbstractClient.h>
+#include <test/support/AbstractClient.h>
 #include <ripple/core/Config.h>
 #include <boost/optional.hpp>
 #include <chrono>
diff --git a/src/test/WSClient_test.cpp b/src/test/support/WSClient_test.cpp
similarity index 96%
rename from src/test/WSClient_test.cpp
rename to src/test/support/WSClient_test.cpp
index 5c8fdc057b7..eeb4e95331a 100644
--- a/src/test/WSClient_test.cpp
+++ b/src/test/support/WSClient_test.cpp
@@ -18,8 +18,8 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/WSClient.h>
-#include <ripple/test/jtx.h>
+#include <test/support/WSClient.h>
+#include <test/support/jtx.h>
 #include <ripple/beast/unit_test.h>
 #include <beast/core/handler_alloc.hpp>
 
diff --git a/src/ripple/test/impl/JSONRPCClient.cpp b/src/test/support/impl/JSONRPCClient.cpp
similarity index 99%
rename from src/ripple/test/impl/JSONRPCClient.cpp
rename to src/test/support/impl/JSONRPCClient.cpp
index fefc30b584a..ad39587ea36 100644
--- a/src/ripple/test/impl/JSONRPCClient.cpp
+++ b/src/test/support/impl/JSONRPCClient.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 #include <BeastConfig.h>
-#include <ripple/test/JSONRPCClient.h>
+#include <test/support/JSONRPCClient.h>
 #include <ripple/json/json_reader.h>
 #include <ripple/json/to_string.h>
 #include <ripple/protocol/JsonFields.h>
diff --git a/src/ripple/test/impl/ManualTimeKeeper.cpp b/src/test/support/impl/ManualTimeKeeper.cpp
similarity index 98%
rename from src/ripple/test/impl/ManualTimeKeeper.cpp
rename to src/test/support/impl/ManualTimeKeeper.cpp
index 01430c7750d..0a2e888a5c7 100644
--- a/src/ripple/test/impl/ManualTimeKeeper.cpp
+++ b/src/test/support/impl/ManualTimeKeeper.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/ManualTimeKeeper.h>
+#include <test/support/ManualTimeKeeper.h>
 
 namespace ripple {
 namespace test {
diff --git a/src/ripple/test/impl/WSClient.cpp b/src/test/support/impl/WSClient.cpp
similarity index 99%
rename from src/ripple/test/impl/WSClient.cpp
rename to src/test/support/impl/WSClient.cpp
index e0375096f14..45592c56099 100644
--- a/src/ripple/test/impl/WSClient.cpp
+++ b/src/test/support/impl/WSClient.cpp
@@ -18,8 +18,8 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/WSClient.h>
-#include <ripple/test/jtx.h>
+#include <test/support/WSClient.h>
+#include <test/support/jtx.h>
 #include <ripple/json/json_reader.h>
 #include <ripple/json/to_string.h>
 #include <ripple/protocol/JsonFields.h>
diff --git a/src/ripple/test/jtx.h b/src/test/support/jtx.h
similarity index 50%
rename from src/ripple/test/jtx.h
rename to src/test/support/jtx.h
index 24766929cbe..05bae57aa9f 100644
--- a/src/ripple/test/jtx.h
+++ b/src/test/support/jtx.h
@@ -23,38 +23,38 @@
 // Convenience header that includes everything
 
 #include <ripple/json/to_string.h>
-#include <ripple/test/jtx/Account.h>
-#include <ripple/test/jtx/amount.h>
-#include <ripple/test/jtx/balance.h>
-#include <ripple/test/jtx/delivermin.h>
-#include <ripple/test/jtx/Env.h>
-#include <ripple/test/jtx/Env_ss.h>
-#include <ripple/test/jtx/fee.h>
-#include <ripple/test/jtx/flags.h>
-#include <ripple/test/jtx/jtx_json.h>
-#include <ripple/test/jtx/JTx.h>
-#include <ripple/test/jtx/memo.h>
-#include <ripple/test/jtx/multisign.h>
-#include <ripple/test/jtx/noop.h>
-#include <ripple/test/jtx/offer.h>
-#include <ripple/test/jtx/owners.h>
-#include <ripple/test/jtx/paths.h>
-#include <ripple/test/jtx/pay.h>
-#include <ripple/test/jtx/prop.h>
-#include <ripple/test/jtx/quality.h>
-#include <ripple/test/jtx/rate.h>
-#include <ripple/test/jtx/regkey.h>
-#include <ripple/test/jtx/require.h>
-#include <ripple/test/jtx/requires.h>
-#include <ripple/test/jtx/sendmax.h>
-#include <ripple/test/jtx/seq.h>
-#include <ripple/test/jtx/sig.h>
-#include <ripple/test/jtx/tag.h>
-#include <ripple/test/jtx/tags.h>
-#include <ripple/test/jtx/ter.h>
-#include <ripple/test/jtx/ticket.h>
-#include <ripple/test/jtx/trust.h>
-#include <ripple/test/jtx/txflags.h>
-#include <ripple/test/jtx/utility.h>
+#include <test/support/jtx/Account.h>
+#include <test/support/jtx/amount.h>
+#include <test/support/jtx/balance.h>
+#include <test/support/jtx/delivermin.h>
+#include <test/support/jtx/Env.h>
+#include <test/support/jtx/Env_ss.h>
+#include <test/support/jtx/fee.h>
+#include <test/support/jtx/flags.h>
+#include <test/support/jtx/jtx_json.h>
+#include <test/support/jtx/JTx.h>
+#include <test/support/jtx/memo.h>
+#include <test/support/jtx/multisign.h>
+#include <test/support/jtx/noop.h>
+#include <test/support/jtx/offer.h>
+#include <test/support/jtx/owners.h>
+#include <test/support/jtx/paths.h>
+#include <test/support/jtx/pay.h>
+#include <test/support/jtx/prop.h>
+#include <test/support/jtx/quality.h>
+#include <test/support/jtx/rate.h>
+#include <test/support/jtx/regkey.h>
+#include <test/support/jtx/require.h>
+#include <test/support/jtx/requires.h>
+#include <test/support/jtx/sendmax.h>
+#include <test/support/jtx/seq.h>
+#include <test/support/jtx/sig.h>
+#include <test/support/jtx/tag.h>
+#include <test/support/jtx/tags.h>
+#include <test/support/jtx/ter.h>
+#include <test/support/jtx/ticket.h>
+#include <test/support/jtx/trust.h>
+#include <test/support/jtx/txflags.h>
+#include <test/support/jtx/utility.h>
 
 #endif
diff --git a/src/ripple/test/jtx/Account.h b/src/test/support/jtx/Account.h
similarity index 100%
rename from src/ripple/test/jtx/Account.h
rename to src/test/support/jtx/Account.h
diff --git a/src/ripple/test/jtx/Env.h b/src/test/support/jtx/Env.h
similarity index 98%
rename from src/ripple/test/jtx/Env.h
rename to src/test/support/jtx/Env.h
index 68072ae61c9..ea682642bd4 100644
--- a/src/ripple/test/jtx/Env.h
+++ b/src/test/support/jtx/Env.h
@@ -20,13 +20,13 @@
 #ifndef RIPPLE_TEST_JTX_ENV_H_INCLUDED
 #define RIPPLE_TEST_JTX_ENV_H_INCLUDED
 
-#include <ripple/test/jtx/Account.h>
-#include <ripple/test/jtx/amount.h>
-#include <ripple/test/jtx/JTx.h>
-#include <ripple/test/jtx/require.h>
-#include <ripple/test/jtx/tags.h>
-#include <ripple/test/AbstractClient.h>
-#include <ripple/test/ManualTimeKeeper.h>
+#include <test/support/jtx/Account.h>
+#include <test/support/jtx/amount.h>
+#include <test/support/jtx/JTx.h>
+#include <test/support/jtx/require.h>
+#include <test/support/jtx/tags.h>
+#include <test/support/AbstractClient.h>
+#include <test/support/ManualTimeKeeper.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/app/ledger/Ledger.h>
 #include <ripple/app/ledger/OpenLedger.h>
diff --git a/src/ripple/test/jtx/Env_ss.h b/src/test/support/jtx/Env_ss.h
similarity index 98%
rename from src/ripple/test/jtx/Env_ss.h
rename to src/test/support/jtx/Env_ss.h
index 80ede0daf8a..b98bc219f09 100644
--- a/src/ripple/test/jtx/Env_ss.h
+++ b/src/test/support/jtx/Env_ss.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TEST_JTX_ENV_SS_H_INCLUDED
 #define RIPPLE_TEST_JTX_ENV_SS_H_INCLUDED
 
-#include <ripple/test/jtx/Env.h>
+#include <test/support/jtx/Env.h>
 
 namespace ripple {
 namespace test {
diff --git a/src/ripple/test/jtx/JTx.h b/src/test/support/jtx/JTx.h
similarity index 98%
rename from src/ripple/test/jtx/JTx.h
rename to src/test/support/jtx/JTx.h
index ea1dde02ee7..490d78a8ada 100644
--- a/src/ripple/test/jtx/JTx.h
+++ b/src/test/support/jtx/JTx.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_TEST_JTX_JTX_H_INCLUDED
 #define RIPPLE_TEST_JTX_JTX_H_INCLUDED
 
-#include <ripple/test/jtx/requires.h>
-#include <ripple/test/jtx/basic_prop.h>
+#include <test/support/jtx/requires.h>
+#include <test/support/jtx/basic_prop.h>
 #include <ripple/json/json_value.h>
 #include <ripple/protocol/STTx.h>
 #include <ripple/protocol/TER.h>
diff --git a/src/ripple/test/jtx/amount.h b/src/test/support/jtx/amount.h
similarity index 98%
rename from src/ripple/test/jtx/amount.h
rename to src/test/support/jtx/amount.h
index 807dc415dc0..11802a852f1 100644
--- a/src/ripple/test/jtx/amount.h
+++ b/src/test/support/jtx/amount.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_TEST_JTX_AMOUNT_H_INCLUDED
 #define RIPPLE_TEST_JTX_AMOUNT_H_INCLUDED
 
-#include <ripple/test/jtx/Account.h>
-#include <ripple/test/jtx/amount.h>
-#include <ripple/test/jtx/tags.h>
+#include <test/support/jtx/Account.h>
+#include <test/support/jtx/amount.h>
+#include <test/support/jtx/tags.h>
 #include <ripple/protocol/Issue.h>
 #include <ripple/protocol/STAmount.h>
 #include <ripple/basics/contract.h>
diff --git a/src/ripple/test/jtx/balance.h b/src/test/support/jtx/balance.h
similarity index 96%
rename from src/ripple/test/jtx/balance.h
rename to src/test/support/jtx/balance.h
index 37457b98ac8..be21299c645 100644
--- a/src/ripple/test/jtx/balance.h
+++ b/src/test/support/jtx/balance.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_TEST_JTX_BALANCE_H_INCLUDED
 #define RIPPLE_TEST_JTX_BALANCE_H_INCLUDED
 
-#include <ripple/test/jtx/tags.h>
-#include <ripple/test/jtx/Env.h>
+#include <test/support/jtx/tags.h>
+#include <test/support/jtx/Env.h>
 
 namespace ripple {
 namespace test {
diff --git a/src/ripple/test/jtx/basic_prop.h b/src/test/support/jtx/basic_prop.h
similarity index 100%
rename from src/ripple/test/jtx/basic_prop.h
rename to src/test/support/jtx/basic_prop.h
diff --git a/src/ripple/test/jtx/delivermin.h b/src/test/support/jtx/delivermin.h
similarity index 97%
rename from src/ripple/test/jtx/delivermin.h
rename to src/test/support/jtx/delivermin.h
index 7b2d609a21f..7abdd7d4c3b 100644
--- a/src/ripple/test/jtx/delivermin.h
+++ b/src/test/support/jtx/delivermin.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TEST_JTX_DELIVERMIN_H_INCLUDED
 #define RIPPLE_TEST_JTX_DELIVERMIN_H_INCLUDED
 
-#include <ripple/test/jtx/Env.h>
+#include <test/support/jtx/Env.h>
 #include <ripple/protocol/STAmount.h>
 
 namespace ripple {
diff --git a/src/ripple/test/jtx/fee.h b/src/test/support/jtx/fee.h
similarity index 96%
rename from src/ripple/test/jtx/fee.h
rename to src/test/support/jtx/fee.h
index 5a6a09e36e8..c07f8898b41 100644
--- a/src/ripple/test/jtx/fee.h
+++ b/src/test/support/jtx/fee.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_TEST_JTX_FEE_H_INCLUDED
 #define RIPPLE_TEST_JTX_FEE_H_INCLUDED
 
-#include <ripple/test/jtx/Env.h>
-#include <ripple/test/jtx/tags.h>
+#include <test/support/jtx/Env.h>
+#include <test/support/jtx/tags.h>
 #include <ripple/protocol/STAmount.h>
 #include <ripple/basics/contract.h>
 #include <boost/optional.hpp>
diff --git a/src/ripple/test/jtx/flags.h b/src/test/support/jtx/flags.h
similarity index 99%
rename from src/ripple/test/jtx/flags.h
rename to src/test/support/jtx/flags.h
index 2bf5b8e44f4..b91570a16b5 100644
--- a/src/ripple/test/jtx/flags.h
+++ b/src/test/support/jtx/flags.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TEST_JTX_FLAGS_H_INCLUDED
 #define RIPPLE_TEST_JTX_FLAGS_H_INCLUDED
 
-#include <ripple/test/jtx/Env.h>
+#include <test/support/jtx/Env.h>
 #include <ripple/protocol/LedgerFormats.h>
 #include <ripple/protocol/TxFlags.h>
 #include <ripple/basics/contract.h>
diff --git a/src/ripple/test/jtx/impl/Account.cpp b/src/test/support/jtx/impl/Account.cpp
similarity index 97%
rename from src/ripple/test/jtx/impl/Account.cpp
rename to src/test/support/jtx/impl/Account.cpp
index c315d98fc3f..8ec9efec1f8 100644
--- a/src/ripple/test/jtx/impl/Account.cpp
+++ b/src/test/support/jtx/impl/Account.cpp
@@ -18,8 +18,8 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx/Account.h>
-#include <ripple/test/jtx/amount.h>
+#include <test/support/jtx/Account.h>
+#include <test/support/jtx/amount.h>
 #include <ripple/protocol/types.h>
 
 namespace ripple {
diff --git a/src/ripple/test/jtx/impl/Env.cpp b/src/test/support/jtx/impl/Env.cpp
similarity index 97%
rename from src/ripple/test/jtx/impl/Env.cpp
rename to src/test/support/jtx/impl/Env.cpp
index 8a11969a2a4..5a87be6d5c8 100644
--- a/src/ripple/test/jtx/impl/Env.cpp
+++ b/src/test/support/jtx/impl/Env.cpp
@@ -18,17 +18,17 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx/balance.h>
-#include <ripple/test/jtx/Env.h>
-#include <ripple/test/jtx/fee.h>
-#include <ripple/test/jtx/flags.h>
-#include <ripple/test/jtx/pay.h>
-#include <ripple/test/jtx/trust.h>
-#include <ripple/test/jtx/require.h>
-#include <ripple/test/jtx/seq.h>
-#include <ripple/test/jtx/sig.h>
-#include <ripple/test/jtx/utility.h>
-#include <ripple/test/JSONRPCClient.h>
+#include <test/support/jtx/balance.h>
+#include <test/support/jtx/Env.h>
+#include <test/support/jtx/fee.h>
+#include <test/support/jtx/flags.h>
+#include <test/support/jtx/pay.h>
+#include <test/support/jtx/trust.h>
+#include <test/support/jtx/require.h>
+#include <test/support/jtx/seq.h>
+#include <test/support/jtx/sig.h>
+#include <test/support/jtx/utility.h>
+#include <test/support/JSONRPCClient.h>
 #include <ripple/app/ledger/LedgerMaster.h>
 #include <ripple/app/ledger/LedgerTiming.h>
 #include <ripple/app/misc/NetworkOPs.h>
diff --git a/src/ripple/test/jtx/impl/amount.cpp b/src/test/support/jtx/impl/amount.cpp
similarity index 97%
rename from src/ripple/test/jtx/impl/amount.cpp
rename to src/test/support/jtx/impl/amount.cpp
index a18eb652f2d..51768e4013e 100644
--- a/src/ripple/test/jtx/impl/amount.cpp
+++ b/src/test/support/jtx/impl/amount.cpp
@@ -18,8 +18,8 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx/Account.h>
-#include <ripple/test/jtx/amount.h>
+#include <test/support/jtx/Account.h>
+#include <test/support/jtx/amount.h>
 #include <cassert>
 #include <cmath>
 #include <iomanip>
diff --git a/src/ripple/test/jtx/impl/balance.cpp b/src/test/support/jtx/impl/balance.cpp
similarity index 98%
rename from src/ripple/test/jtx/impl/balance.cpp
rename to src/test/support/jtx/impl/balance.cpp
index b4c06a4768c..783d229231a 100644
--- a/src/ripple/test/jtx/impl/balance.cpp
+++ b/src/test/support/jtx/impl/balance.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx/balance.h>
+#include <test/support/jtx/balance.h>
 
 namespace ripple {
 namespace test {
diff --git a/src/ripple/test/jtx/impl/delivermin.cpp b/src/test/support/jtx/impl/delivermin.cpp
similarity index 96%
rename from src/ripple/test/jtx/impl/delivermin.cpp
rename to src/test/support/jtx/impl/delivermin.cpp
index bbcb46cb560..31ddb0062de 100644
--- a/src/ripple/test/jtx/impl/delivermin.cpp
+++ b/src/test/support/jtx/impl/delivermin.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx/delivermin.h>
+#include <test/support/jtx/delivermin.h>
 #include <ripple/protocol/JsonFields.h>
 
 namespace ripple {
diff --git a/src/ripple/test/jtx/impl/fee.cpp b/src/test/support/jtx/impl/fee.cpp
similarity index 97%
rename from src/ripple/test/jtx/impl/fee.cpp
rename to src/test/support/jtx/impl/fee.cpp
index f83da007248..1aae18be624 100644
--- a/src/ripple/test/jtx/impl/fee.cpp
+++ b/src/test/support/jtx/impl/fee.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx/fee.h>
+#include <test/support/jtx/fee.h>
 #include <ripple/protocol/JsonFields.h>
 
 namespace ripple {
diff --git a/src/ripple/test/jtx/impl/flags.cpp b/src/test/support/jtx/impl/flags.cpp
similarity index 98%
rename from src/ripple/test/jtx/impl/flags.cpp
rename to src/test/support/jtx/impl/flags.cpp
index 941ec6db050..0e028ec5c2c 100644
--- a/src/ripple/test/jtx/impl/flags.cpp
+++ b/src/test/support/jtx/impl/flags.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx/flags.h>
+#include <test/support/jtx/flags.h>
 #include <ripple/protocol/JsonFields.h>
 
 namespace ripple {
diff --git a/src/ripple/test/jtx/impl/jtx_json.cpp b/src/test/support/jtx/impl/jtx_json.cpp
similarity index 95%
rename from src/ripple/test/jtx/impl/jtx_json.cpp
rename to src/test/support/jtx/impl/jtx_json.cpp
index 26ea0e33afe..7848fd58ee7 100644
--- a/src/ripple/test/jtx/impl/jtx_json.cpp
+++ b/src/test/support/jtx/impl/jtx_json.cpp
@@ -18,8 +18,8 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx/jtx_json.h>
-#include <ripple/test/jtx/utility.h>
+#include <test/support/jtx/jtx_json.h>
+#include <test/support/jtx/utility.h>
 #include <ripple/json/json_reader.h>
 #include <ripple/basics/contract.h>
 
diff --git a/src/ripple/test/jtx/impl/memo.cpp b/src/test/support/jtx/impl/memo.cpp
similarity index 98%
rename from src/ripple/test/jtx/impl/memo.cpp
rename to src/test/support/jtx/impl/memo.cpp
index 74e6c93b883..617c6519914 100644
--- a/src/ripple/test/jtx/impl/memo.cpp
+++ b/src/test/support/jtx/impl/memo.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx/memo.h>
+#include <test/support/jtx/memo.h>
 #include <ripple/basics/StringUtilities.h>
 #include <ripple/protocol/JsonFields.h>
 
diff --git a/src/ripple/test/jtx/impl/multisign.cpp b/src/test/support/jtx/impl/multisign.cpp
similarity index 97%
rename from src/ripple/test/jtx/impl/multisign.cpp
rename to src/test/support/jtx/impl/multisign.cpp
index a63a9ee1948..4cc478d9d36 100644
--- a/src/ripple/test/jtx/impl/multisign.cpp
+++ b/src/test/support/jtx/impl/multisign.cpp
@@ -18,8 +18,8 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx/multisign.h>
-#include <ripple/test/jtx/utility.h>
+#include <test/support/jtx/multisign.h>
+#include <test/support/jtx/utility.h>
 #include <ripple/protocol/HashPrefix.h>
 #include <ripple/protocol/JsonFields.h>
 #include <ripple/protocol/Sign.h>
diff --git a/src/ripple/test/jtx/impl/offer.cpp b/src/test/support/jtx/impl/offer.cpp
similarity index 97%
rename from src/ripple/test/jtx/impl/offer.cpp
rename to src/test/support/jtx/impl/offer.cpp
index d9cab03a91d..8f8a6a4f48c 100644
--- a/src/ripple/test/jtx/impl/offer.cpp
+++ b/src/test/support/jtx/impl/offer.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx/offer.h>
+#include <test/support/jtx/offer.h>
 #include <ripple/protocol/JsonFields.h>
 
 namespace ripple {
diff --git a/src/ripple/test/jtx/impl/owners.cpp b/src/test/support/jtx/impl/owners.cpp
similarity index 98%
rename from src/ripple/test/jtx/impl/owners.cpp
rename to src/test/support/jtx/impl/owners.cpp
index 6bb4a899ffd..83a7bfaef24 100644
--- a/src/ripple/test/jtx/impl/owners.cpp
+++ b/src/test/support/jtx/impl/owners.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx/owners.h>
+#include <test/support/jtx/owners.h>
 
 namespace ripple {
 namespace test {
diff --git a/src/ripple/test/jtx/impl/paths.cpp b/src/test/support/jtx/impl/paths.cpp
similarity index 98%
rename from src/ripple/test/jtx/impl/paths.cpp
rename to src/test/support/jtx/impl/paths.cpp
index 90efdc02880..888054dc2f5 100644
--- a/src/ripple/test/jtx/impl/paths.cpp
+++ b/src/test/support/jtx/impl/paths.cpp
@@ -19,7 +19,7 @@
 
 #include <BeastConfig.h>
 #include <ripple/app/paths/Pathfinder.h>
-#include <ripple/test/jtx/paths.h>
+#include <test/support/jtx/paths.h>
 #include <ripple/protocol/JsonFields.h>
 
 namespace ripple {
diff --git a/src/ripple/test/jtx/impl/pay.cpp b/src/test/support/jtx/impl/pay.cpp
similarity index 97%
rename from src/ripple/test/jtx/impl/pay.cpp
rename to src/test/support/jtx/impl/pay.cpp
index f4689f3b6bb..396aab7b466 100644
--- a/src/ripple/test/jtx/impl/pay.cpp
+++ b/src/test/support/jtx/impl/pay.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx/pay.h>
+#include <test/support/jtx/pay.h>
 #include <ripple/protocol/JsonFields.h>
 #include <ripple/protocol/TxFlags.h>
 
diff --git a/src/ripple/test/jtx/impl/quality2.cpp b/src/test/support/jtx/impl/quality2.cpp
similarity index 98%
rename from src/ripple/test/jtx/impl/quality2.cpp
rename to src/test/support/jtx/impl/quality2.cpp
index 3d0e634a289..97fd979fdb6 100644
--- a/src/ripple/test/jtx/impl/quality2.cpp
+++ b/src/test/support/jtx/impl/quality2.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx/quality.h>
+#include <test/support/jtx/quality.h>
 #include <ripple/protocol/SField.h>
 #include <ripple/protocol/Quality.h>
 
diff --git a/src/ripple/test/jtx/impl/rate.cpp b/src/test/support/jtx/impl/rate.cpp
similarity index 97%
rename from src/ripple/test/jtx/impl/rate.cpp
rename to src/test/support/jtx/impl/rate.cpp
index d931772ee2a..f00c7e7398e 100644
--- a/src/ripple/test/jtx/impl/rate.cpp
+++ b/src/test/support/jtx/impl/rate.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx/rate.h>
+#include <test/support/jtx/rate.h>
 #include <ripple/protocol/JsonFields.h>
 #include <ripple/basics/contract.h>
 #include <stdexcept>
diff --git a/src/ripple/test/jtx/impl/regkey.cpp b/src/test/support/jtx/impl/regkey.cpp
similarity index 97%
rename from src/ripple/test/jtx/impl/regkey.cpp
rename to src/test/support/jtx/impl/regkey.cpp
index 9ccffea3c9d..306eb1cf907 100644
--- a/src/ripple/test/jtx/impl/regkey.cpp
+++ b/src/test/support/jtx/impl/regkey.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx/regkey.h>
+#include <test/support/jtx/regkey.h>
 #include <ripple/protocol/JsonFields.h>
 
 namespace ripple {
diff --git a/src/ripple/test/jtx/impl/sendmax.cpp b/src/test/support/jtx/impl/sendmax.cpp
similarity index 97%
rename from src/ripple/test/jtx/impl/sendmax.cpp
rename to src/test/support/jtx/impl/sendmax.cpp
index c680dcaa1f9..f2cd22f6568 100644
--- a/src/ripple/test/jtx/impl/sendmax.cpp
+++ b/src/test/support/jtx/impl/sendmax.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx/sendmax.h>
+#include <test/support/jtx/sendmax.h>
 #include <ripple/protocol/JsonFields.h>
 
 namespace ripple {
diff --git a/src/ripple/test/jtx/impl/seq.cpp b/src/test/support/jtx/impl/seq.cpp
similarity index 97%
rename from src/ripple/test/jtx/impl/seq.cpp
rename to src/test/support/jtx/impl/seq.cpp
index f5a4f0ec15b..4722c4e07ff 100644
--- a/src/ripple/test/jtx/impl/seq.cpp
+++ b/src/test/support/jtx/impl/seq.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx/seq.h>
+#include <test/support/jtx/seq.h>
 #include <ripple/protocol/JsonFields.h>
 
 namespace ripple {
diff --git a/src/ripple/test/jtx/impl/sig.cpp b/src/test/support/jtx/impl/sig.cpp
similarity index 95%
rename from src/ripple/test/jtx/impl/sig.cpp
rename to src/test/support/jtx/impl/sig.cpp
index c0e5a088f5a..b1a16569e29 100644
--- a/src/ripple/test/jtx/impl/sig.cpp
+++ b/src/test/support/jtx/impl/sig.cpp
@@ -18,8 +18,8 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx/sig.h>
-#include <ripple/test/jtx/utility.h>
+#include <test/support/jtx/sig.h>
+#include <test/support/jtx/utility.h>
 
 namespace ripple {
 namespace test {
diff --git a/src/ripple/test/jtx/impl/tag.cpp b/src/test/support/jtx/impl/tag.cpp
similarity index 97%
rename from src/ripple/test/jtx/impl/tag.cpp
rename to src/test/support/jtx/impl/tag.cpp
index d7260db8ec3..238e8043961 100644
--- a/src/ripple/test/jtx/impl/tag.cpp
+++ b/src/test/support/jtx/impl/tag.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx/tag.h>
+#include <test/support/jtx/tag.h>
 #include <ripple/protocol/JsonFields.h>
 
 namespace ripple {
diff --git a/src/ripple/test/jtx/impl/ticket.cpp b/src/test/support/jtx/impl/ticket.cpp
similarity index 98%
rename from src/ripple/test/jtx/impl/ticket.cpp
rename to src/test/support/jtx/impl/ticket.cpp
index d080bd69511..a1b1fe5d303 100644
--- a/src/ripple/test/jtx/impl/ticket.cpp
+++ b/src/test/support/jtx/impl/ticket.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx/ticket.h>
+#include <test/support/jtx/ticket.h>
 #include <ripple/protocol/JsonFields.h>
 
 namespace ripple {
diff --git a/src/ripple/test/jtx/impl/trust.cpp b/src/test/support/jtx/impl/trust.cpp
similarity index 98%
rename from src/ripple/test/jtx/impl/trust.cpp
rename to src/test/support/jtx/impl/trust.cpp
index 81c173ab74f..e72167bf870 100644
--- a/src/ripple/test/jtx/impl/trust.cpp
+++ b/src/test/support/jtx/impl/trust.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx/trust.h>
+#include <test/support/jtx/trust.h>
 #include <ripple/protocol/JsonFields.h>
 #include <ripple/basics/contract.h>
 #include <stdexcept>
diff --git a/src/ripple/test/jtx/impl/txflags.cpp b/src/test/support/jtx/impl/txflags.cpp
similarity index 97%
rename from src/ripple/test/jtx/impl/txflags.cpp
rename to src/test/support/jtx/impl/txflags.cpp
index 260fd1a4749..531d77571ab 100644
--- a/src/ripple/test/jtx/impl/txflags.cpp
+++ b/src/test/support/jtx/impl/txflags.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx/txflags.h>
+#include <test/support/jtx/txflags.h>
 #include <ripple/protocol/JsonFields.h>
 
 namespace ripple {
diff --git a/src/ripple/test/jtx/impl/utility.cpp b/src/test/support/jtx/impl/utility.cpp
similarity index 98%
rename from src/ripple/test/jtx/impl/utility.cpp
rename to src/test/support/jtx/impl/utility.cpp
index 784a5d17361..0c2108b2d59 100644
--- a/src/ripple/test/jtx/impl/utility.cpp
+++ b/src/test/support/jtx/impl/utility.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx/utility.h>
+#include <test/support/jtx/utility.h>
 #include <ripple/protocol/ErrorCodes.h>
 #include <ripple/protocol/HashPrefix.h>
 #include <ripple/protocol/Indexes.h>
diff --git a/src/ripple/test/jtx/jtx_json.h b/src/test/support/jtx/jtx_json.h
similarity index 98%
rename from src/ripple/test/jtx/jtx_json.h
rename to src/test/support/jtx/jtx_json.h
index df246a0856d..c9c0e6928cc 100644
--- a/src/ripple/test/jtx/jtx_json.h
+++ b/src/test/support/jtx/jtx_json.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TEST_JTX_JSON_H_INCLUDED
 #define RIPPLE_TEST_JTX_JSON_H_INCLUDED
 
-#include <ripple/test/jtx/Env.h>
+#include <test/support/jtx/Env.h>
 #include <ripple/json/json_value.h>
 
 namespace ripple {
diff --git a/src/ripple/test/jtx/memo.h b/src/test/support/jtx/memo.h
similarity index 98%
rename from src/ripple/test/jtx/memo.h
rename to src/test/support/jtx/memo.h
index 21360c41a6e..08d006ce8c3 100644
--- a/src/ripple/test/jtx/memo.h
+++ b/src/test/support/jtx/memo.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TEST_JTX_MEMO_H_INCLUDED
 #define RIPPLE_TEST_JTX_MEMO_H_INCLUDED
 
-#include <ripple/test/jtx/Env.h>
+#include <test/support/jtx/Env.h>
 #include <boost/optional.hpp>
 
 namespace ripple {
diff --git a/src/ripple/test/jtx/multisign.h b/src/test/support/jtx/multisign.h
similarity index 96%
rename from src/ripple/test/jtx/multisign.h
rename to src/test/support/jtx/multisign.h
index 5eee558c6cc..6971882d2e1 100644
--- a/src/ripple/test/jtx/multisign.h
+++ b/src/test/support/jtx/multisign.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_TEST_JTX_MULTISIGN_H_INCLUDED
 #define RIPPLE_TEST_JTX_MULTISIGN_H_INCLUDED
 
-#include <ripple/test/jtx/Account.h>
-#include <ripple/test/jtx/amount.h>
-#include <ripple/test/jtx/owners.h>
-#include <ripple/test/jtx/tags.h>
+#include <test/support/jtx/Account.h>
+#include <test/support/jtx/amount.h>
+#include <test/support/jtx/owners.h>
+#include <test/support/jtx/tags.h>
 #include <cstdint>
 
 namespace ripple {
diff --git a/src/ripple/test/jtx/noop.h b/src/test/support/jtx/noop.h
similarity index 97%
rename from src/ripple/test/jtx/noop.h
rename to src/test/support/jtx/noop.h
index 0819ce5f3b9..9921bdb4a9e 100644
--- a/src/ripple/test/jtx/noop.h
+++ b/src/test/support/jtx/noop.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TEST_JTX_NOOP_H_INCLUDED
 #define RIPPLE_TEST_JTX_NOOP_H_INCLUDED
 
-#include <ripple/test/jtx/flags.h>
+#include <test/support/jtx/flags.h>
 
 namespace ripple {
 namespace test {
diff --git a/src/ripple/test/jtx/offer.h b/src/test/support/jtx/offer.h
similarity index 97%
rename from src/ripple/test/jtx/offer.h
rename to src/test/support/jtx/offer.h
index a0faac1c9e3..dc1909913f9 100644
--- a/src/ripple/test/jtx/offer.h
+++ b/src/test/support/jtx/offer.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TEST_JTX_OFFER_H_INCLUDED
 #define RIPPLE_TEST_JTX_OFFER_H_INCLUDED
 
-#include <ripple/test/jtx/Account.h>
+#include <test/support/jtx/Account.h>
 #include <ripple/json/json_value.h>
 #include <ripple/protocol/STAmount.h>
 
diff --git a/src/ripple/test/jtx/owners.h b/src/test/support/jtx/owners.h
similarity index 98%
rename from src/ripple/test/jtx/owners.h
rename to src/test/support/jtx/owners.h
index a6ec061f0c8..6409b75899e 100644
--- a/src/ripple/test/jtx/owners.h
+++ b/src/test/support/jtx/owners.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TEST_JTX_OWNERS_H_INCLUDED
 #define RIPPLE_TEST_JTX_OWNERS_H_INCLUDED
 
-#include <ripple/test/jtx/Env.h>
+#include <test/support/jtx/Env.h>
 #include <ripple/ledger/View.h>
 #include <ripple/protocol/LedgerFormats.h>
 #include <ripple/protocol/UintTypes.h>
diff --git a/src/ripple/test/jtx/paths.h b/src/test/support/jtx/paths.h
similarity index 98%
rename from src/ripple/test/jtx/paths.h
rename to src/test/support/jtx/paths.h
index d4873f5a961..1ad8f80e758 100644
--- a/src/ripple/test/jtx/paths.h
+++ b/src/test/support/jtx/paths.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TEST_JTX_PATHS_H_INCLUDED
 #define RIPPLE_TEST_JTX_PATHS_H_INCLUDED
 
-#include <ripple/test/jtx/Env.h>
+#include <test/support/jtx/Env.h>
 #include <ripple/protocol/Issue.h>
 #include <type_traits>
 
diff --git a/src/ripple/test/jtx/pay.h b/src/test/support/jtx/pay.h
similarity index 94%
rename from src/ripple/test/jtx/pay.h
rename to src/test/support/jtx/pay.h
index 467c0a547ec..e023983b433 100644
--- a/src/ripple/test/jtx/pay.h
+++ b/src/test/support/jtx/pay.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_TEST_JTX_PAY_H_INCLUDED
 #define RIPPLE_TEST_JTX_PAY_H_INCLUDED
 
-#include <ripple/test/jtx/Account.h>
-#include <ripple/test/jtx/amount.h>
+#include <test/support/jtx/Account.h>
+#include <test/support/jtx/amount.h>
 #include <ripple/json/json_value.h>
 
 namespace ripple {
diff --git a/src/ripple/test/jtx/prop.h b/src/test/support/jtx/prop.h
similarity index 97%
rename from src/ripple/test/jtx/prop.h
rename to src/test/support/jtx/prop.h
index f3b4f6cf4ba..5600c99d6af 100644
--- a/src/ripple/test/jtx/prop.h
+++ b/src/test/support/jtx/prop.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TEST_JTX_PROP_H_INCLUDED
 #define RIPPLE_TEST_JTX_PROP_H_INCLUDED
 
-#include <ripple/test/jtx/Env.h>
+#include <test/support/jtx/Env.h>
 #include <memory>
 
 namespace ripple {
diff --git a/src/ripple/test/jtx/quality.h b/src/test/support/jtx/quality.h
similarity index 98%
rename from src/ripple/test/jtx/quality.h
rename to src/test/support/jtx/quality.h
index 562e5933c8e..6e1b0389852 100644
--- a/src/ripple/test/jtx/quality.h
+++ b/src/test/support/jtx/quality.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TEST_JTX_QUALITY_H_INCLUDED
 #define RIPPLE_TEST_JTX_QUALITY_H_INCLUDED
 
-#include <ripple/test/jtx/Env.h>
+#include <test/support/jtx/Env.h>
 
 namespace ripple {
 namespace test {
diff --git a/src/ripple/test/jtx/rate.h b/src/test/support/jtx/rate.h
similarity index 97%
rename from src/ripple/test/jtx/rate.h
rename to src/test/support/jtx/rate.h
index 62a9c08d866..c240b7b8c37 100644
--- a/src/ripple/test/jtx/rate.h
+++ b/src/test/support/jtx/rate.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TEST_JTX_RATE_H_INCLUDED
 #define RIPPLE_TEST_JTX_RATE_H_INCLUDED
 
-#include <ripple/test/jtx/Account.h>
+#include <test/support/jtx/Account.h>
 #include <ripple/json/json_value.h>
 
 namespace ripple {
diff --git a/src/ripple/test/jtx/regkey.h b/src/test/support/jtx/regkey.h
similarity index 95%
rename from src/ripple/test/jtx/regkey.h
rename to src/test/support/jtx/regkey.h
index d281bf75a1d..dff40e1f308 100644
--- a/src/ripple/test/jtx/regkey.h
+++ b/src/test/support/jtx/regkey.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_TEST_JTX_REGKEY_H_INCLUDED
 #define RIPPLE_TEST_JTX_REGKEY_H_INCLUDED
 
-#include <ripple/test/jtx/Account.h>
-#include <ripple/test/jtx/tags.h>
+#include <test/support/jtx/Account.h>
+#include <test/support/jtx/tags.h>
 #include <ripple/json/json_value.h>
 
 namespace ripple {
diff --git a/src/ripple/test/jtx/require.h b/src/test/support/jtx/require.h
similarity index 98%
rename from src/ripple/test/jtx/require.h
rename to src/test/support/jtx/require.h
index c20a88b74e0..bdebd50519d 100644
--- a/src/ripple/test/jtx/require.h
+++ b/src/test/support/jtx/require.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TEST_JTX_REQUIRE_H_INCLUDED
 #define RIPPLE_TEST_JTX_REQUIRE_H_INCLUDED
 
-#include <ripple/test/jtx/requires.h>
+#include <test/support/jtx/requires.h>
 #include <functional>
 #include <vector>
 
diff --git a/src/ripple/test/jtx/requires.h b/src/test/support/jtx/requires.h
similarity index 100%
rename from src/ripple/test/jtx/requires.h
rename to src/test/support/jtx/requires.h
diff --git a/src/ripple/test/jtx/sendmax.h b/src/test/support/jtx/sendmax.h
similarity index 97%
rename from src/ripple/test/jtx/sendmax.h
rename to src/test/support/jtx/sendmax.h
index 083e9f8b61c..daf7d4fea53 100644
--- a/src/ripple/test/jtx/sendmax.h
+++ b/src/test/support/jtx/sendmax.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TEST_JTX_SENDMAX_H_INCLUDED
 #define RIPPLE_TEST_JTX_SENDMAX_H_INCLUDED
 
-#include <ripple/test/jtx/Env.h>
+#include <test/support/jtx/Env.h>
 #include <ripple/protocol/STAmount.h>
 
 namespace ripple {
diff --git a/src/ripple/test/jtx/seq.h b/src/test/support/jtx/seq.h
similarity index 95%
rename from src/ripple/test/jtx/seq.h
rename to src/test/support/jtx/seq.h
index 034cf071d81..d6b1fe8e95c 100644
--- a/src/ripple/test/jtx/seq.h
+++ b/src/test/support/jtx/seq.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_TEST_JTX_SEQ_H_INCLUDED
 #define RIPPLE_TEST_JTX_SEQ_H_INCLUDED
 
-#include <ripple/test/jtx/Env.h>
-#include <ripple/test/jtx/tags.h>
+#include <test/support/jtx/Env.h>
+#include <test/support/jtx/tags.h>
 #include <boost/optional.hpp>
 
 namespace ripple {
diff --git a/src/ripple/test/jtx/sig.h b/src/test/support/jtx/sig.h
similarity index 98%
rename from src/ripple/test/jtx/sig.h
rename to src/test/support/jtx/sig.h
index 1465e3b784c..8a33285527e 100644
--- a/src/ripple/test/jtx/sig.h
+++ b/src/test/support/jtx/sig.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TEST_JTX_SIG_H_INCLUDED
 #define RIPPLE_TEST_JTX_SIG_H_INCLUDED
 
-#include <ripple/test/jtx/Env.h>
+#include <test/support/jtx/Env.h>
 #include <boost/optional.hpp>
 
 namespace ripple {
diff --git a/src/ripple/test/jtx/tag.h b/src/test/support/jtx/tag.h
similarity index 98%
rename from src/ripple/test/jtx/tag.h
rename to src/test/support/jtx/tag.h
index e8f2d93d321..6373d0ad4bd 100644
--- a/src/ripple/test/jtx/tag.h
+++ b/src/test/support/jtx/tag.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TEST_JTX_TAG_H_INCLUDED
 #define RIPPLE_TEST_JTX_TAG_H_INCLUDED
 
-#include <ripple/test/jtx/Env.h>
+#include <test/support/jtx/Env.h>
 
 namespace ripple {
 namespace test {
diff --git a/src/ripple/test/jtx/tags.h b/src/test/support/jtx/tags.h
similarity index 100%
rename from src/ripple/test/jtx/tags.h
rename to src/test/support/jtx/tags.h
diff --git a/src/ripple/test/jtx/ter.h b/src/test/support/jtx/ter.h
similarity index 97%
rename from src/ripple/test/jtx/ter.h
rename to src/test/support/jtx/ter.h
index 07ed77384f6..0e5d1ff095c 100644
--- a/src/ripple/test/jtx/ter.h
+++ b/src/test/support/jtx/ter.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TEST_JTX_TER_H_INCLUDED
 #define RIPPLE_TEST_JTX_TER_H_INCLUDED
 
-#include <ripple/test/jtx/Env.h>
+#include <test/support/jtx/Env.h>
 #include <tuple>
 
 namespace ripple {
diff --git a/src/ripple/test/jtx/ticket.h b/src/test/support/jtx/ticket.h
similarity index 96%
rename from src/ripple/test/jtx/ticket.h
rename to src/test/support/jtx/ticket.h
index 1aea80dd6d7..b38fa5bda7e 100644
--- a/src/ripple/test/jtx/ticket.h
+++ b/src/test/support/jtx/ticket.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_TEST_JTX_TICKET_H_INCLUDED
 #define RIPPLE_TEST_JTX_TICKET_H_INCLUDED
 
-#include <ripple/test/jtx/Env.h>
-#include <ripple/test/jtx/Account.h>
-#include <ripple/test/jtx/owners.h>
+#include <test/support/jtx/Env.h>
+#include <test/support/jtx/Account.h>
+#include <test/support/jtx/owners.h>
 #include <boost/optional.hpp>
 #include <cstdint>
 
diff --git a/src/ripple/test/jtx/trust.h b/src/test/support/jtx/trust.h
similarity index 97%
rename from src/ripple/test/jtx/trust.h
rename to src/test/support/jtx/trust.h
index 7f7d69b3e03..9e0c9cfe5fe 100644
--- a/src/ripple/test/jtx/trust.h
+++ b/src/test/support/jtx/trust.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TEST_JTX_TRUST_H_INCLUDED
 #define RIPPLE_TEST_JTX_TRUST_H_INCLUDED
 
-#include <ripple/test/jtx/Account.h>
+#include <test/support/jtx/Account.h>
 #include <ripple/json/json_value.h>
 #include <ripple/protocol/STAmount.h>
 
diff --git a/src/ripple/test/jtx/txflags.h b/src/test/support/jtx/txflags.h
similarity index 97%
rename from src/ripple/test/jtx/txflags.h
rename to src/test/support/jtx/txflags.h
index 5e56e42ab97..63992da3fb7 100644
--- a/src/ripple/test/jtx/txflags.h
+++ b/src/test/support/jtx/txflags.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TEST_JTX_TXFLAGS_H_INCLUDED
 #define RIPPLE_TEST_JTX_TXFLAGS_H_INCLUDED
 
-#include <ripple/test/jtx/Env.h>
+#include <test/support/jtx/Env.h>
 
 namespace ripple {
 namespace test {
diff --git a/src/ripple/test/jtx/utility.h b/src/test/support/jtx/utility.h
similarity index 98%
rename from src/ripple/test/jtx/utility.h
rename to src/test/support/jtx/utility.h
index f97037c6dbf..a01aace4308 100644
--- a/src/ripple/test/jtx/utility.h
+++ b/src/test/support/jtx/utility.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TEST_JTX_UTILITY_H_INCLUDED
 #define RIPPLE_TEST_JTX_UTILITY_H_INCLUDED
 
-#include <ripple/test/jtx/Account.h>
+#include <test/support/jtx/Account.h>
 #include <ripple/json/json_value.h>
 #include <ripple/app/ledger/Ledger.h>
 #include <ripple/protocol/STObject.h>
diff --git a/src/ripple/test/mao.h b/src/test/support/mao.h
similarity index 97%
rename from src/ripple/test/mao.h
rename to src/test/support/mao.h
index c344baab1d4..7d719af20e3 100644
--- a/src/ripple/test/mao.h
+++ b/src/test/support/mao.h
@@ -22,6 +22,6 @@
 
 // Convenience header that includes everything
 
-#include <ripple/test/mao/Net.h>
+#include <test/support/mao/Net.h>
 
 #endif
diff --git a/src/ripple/test/mao/Net.h b/src/test/support/mao/Net.h
similarity index 100%
rename from src/ripple/test/mao/Net.h
rename to src/test/support/mao/Net.h
diff --git a/src/ripple/test/mao/impl/Net.cpp b/src/test/support/mao/impl/Net.cpp
similarity index 97%
rename from src/ripple/test/mao/impl/Net.cpp
rename to src/test/support/mao/impl/Net.cpp
index 957266ded71..6c2ed728619 100644
--- a/src/ripple/test/mao/impl/Net.cpp
+++ b/src/test/support/mao/impl/Net.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/mao/Net.h>
+#include <test/support/mao/Net.h>
 
 namespace ripple {
 namespace test {
diff --git a/src/unity/app_test_unity.cpp b/src/test/unity/app_test_unity.cpp
similarity index 100%
rename from src/unity/app_test_unity.cpp
rename to src/test/unity/app_test_unity.cpp
diff --git a/src/unity/basics_test_unity.cpp b/src/test/unity/basics_test_unity.cpp
similarity index 100%
rename from src/unity/basics_test_unity.cpp
rename to src/test/unity/basics_test_unity.cpp
diff --git a/src/unity/beast_test_unity.cpp b/src/test/unity/beast_test_unity.cpp
similarity index 100%
rename from src/unity/beast_test_unity.cpp
rename to src/test/unity/beast_test_unity.cpp
diff --git a/src/unity/conditions_test_unity.cpp b/src/test/unity/conditions_test_unity.cpp
similarity index 100%
rename from src/unity/conditions_test_unity.cpp
rename to src/test/unity/conditions_test_unity.cpp
diff --git a/src/unity/core_test_unity.cpp b/src/test/unity/core_test_unity.cpp
similarity index 100%
rename from src/unity/core_test_unity.cpp
rename to src/test/unity/core_test_unity.cpp
diff --git a/src/unity/json_test_unity.cpp b/src/test/unity/json_test_unity.cpp
similarity index 100%
rename from src/unity/json_test_unity.cpp
rename to src/test/unity/json_test_unity.cpp
diff --git a/src/unity/ledger_test_unity.cpp b/src/test/unity/ledger_test_unity.cpp
similarity index 100%
rename from src/unity/ledger_test_unity.cpp
rename to src/test/unity/ledger_test_unity.cpp
diff --git a/src/unity/nodestore_test_unity.cpp b/src/test/unity/nodestore_test_unity.cpp
similarity index 100%
rename from src/unity/nodestore_test_unity.cpp
rename to src/test/unity/nodestore_test_unity.cpp
diff --git a/src/unity/overlay_test_unity.cpp b/src/test/unity/overlay_test_unity.cpp
similarity index 100%
rename from src/unity/overlay_test_unity.cpp
rename to src/test/unity/overlay_test_unity.cpp
diff --git a/src/unity/peerfinder_test_unity.cpp b/src/test/unity/peerfinder_test_unity.cpp
similarity index 100%
rename from src/unity/peerfinder_test_unity.cpp
rename to src/test/unity/peerfinder_test_unity.cpp
diff --git a/src/unity/protocol_test_unity.cpp b/src/test/unity/protocol_test_unity.cpp
similarity index 100%
rename from src/unity/protocol_test_unity.cpp
rename to src/test/unity/protocol_test_unity.cpp
diff --git a/src/unity/resource_test_unity.cpp b/src/test/unity/resource_test_unity.cpp
similarity index 100%
rename from src/unity/resource_test_unity.cpp
rename to src/test/unity/resource_test_unity.cpp
diff --git a/src/unity/rpc_test_unity.cpp b/src/test/unity/rpc_test_unity.cpp
similarity index 100%
rename from src/unity/rpc_test_unity.cpp
rename to src/test/unity/rpc_test_unity.cpp
diff --git a/src/unity/server_test_unity.cpp b/src/test/unity/server_test_unity.cpp
similarity index 100%
rename from src/unity/server_test_unity.cpp
rename to src/test/unity/server_test_unity.cpp
diff --git a/src/unity/shamap_test_unity.cpp b/src/test/unity/shamap_test_unity.cpp
similarity index 100%
rename from src/unity/shamap_test_unity.cpp
rename to src/test/unity/shamap_test_unity.cpp
diff --git a/src/test/unity/support_unity.cpp b/src/test/unity/support_unity.cpp
new file mode 100644
index 00000000000..63433a7ee67
--- /dev/null
+++ b/src/test/unity/support_unity.cpp
@@ -0,0 +1,55 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of rippled: https://github.com/ripple/rippled
+    Copyright (c) 2012, 2013 Ripple Labs Inc.
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include <BeastConfig.h>
+
+#include <test/support/jtx/impl/Account.cpp>
+#include <test/support/jtx/impl/amount.cpp>
+#include <test/support/jtx/impl/balance.cpp>
+#include <test/support/jtx/impl/delivermin.cpp>
+#include <test/support/jtx/impl/Env.cpp>
+#include <test/support/jtx/impl/fee.cpp>
+#include <test/support/jtx/impl/flags.cpp>
+#include <test/support/jtx/impl/jtx_json.cpp>
+#include <test/support/jtx/impl/memo.cpp>
+#include <test/support/jtx/impl/multisign.cpp>
+#include <test/support/jtx/impl/offer.cpp>
+#include <test/support/jtx/impl/owners.cpp>
+#include <test/support/jtx/impl/paths.cpp>
+#include <test/support/jtx/impl/pay.cpp>
+#include <test/support/jtx/impl/quality2.cpp>
+#include <test/support/jtx/impl/rate.cpp>
+#include <test/support/jtx/impl/regkey.cpp>
+#include <test/support/jtx/impl/sendmax.cpp>
+#include <test/support/jtx/impl/seq.cpp>
+#include <test/support/jtx/impl/sig.cpp>
+#include <test/support/jtx/impl/tag.cpp>
+#include <test/support/jtx/impl/ticket.cpp>
+#include <test/support/jtx/impl/trust.cpp>
+#include <test/support/jtx/impl/txflags.cpp>
+#include <test/support/jtx/impl/utility.cpp>
+
+#include <test/support/mao/impl/Net.cpp>
+#include <test/support/impl/JSONRPCClient.cpp>
+#include <test/support/impl/ManualTimeKeeper.cpp>
+#include <test/support/impl/WSClient.cpp>
+
+#include <test/support/BasicNetwork_test.cpp>
+#include <test/support/Env_test.cpp>
+#include <test/support/WSClient_test.cpp>
diff --git a/src/unity/test_unity.cpp b/src/unity/test_unity.cpp
deleted file mode 100644
index a6ee7139974..00000000000
--- a/src/unity/test_unity.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of rippled: https://github.com/ripple/rippled
-    Copyright (c) 2012, 2013 Ripple Labs Inc.
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#include <test/BasicNetwork_test.cpp>
-#include <test/Env_test.cpp>
-#include <test/WSClient_test.cpp>