diff --git a/Builds/VisualStudio2013/RippleD.vcxproj b/Builds/VisualStudio2013/RippleD.vcxproj
index db3947961b..951245e292 100644
--- a/Builds/VisualStudio2013/RippleD.vcxproj
+++ b/Builds/VisualStudio2013/RippleD.vcxproj
@@ -1555,14 +1555,6 @@
-
- True
- True
-
-
- True
- True
-
True
True
@@ -1687,14 +1679,38 @@
-
- True
- True
-
+
+ True
+ True
+
+
+ True
+ True
+
+
+ True
+ True
+
+
+ True
+ True
+
+
+ True
+ True
+
+
+ True
+ True
+
+
+ True
+ True
+
True
True
@@ -1703,6 +1719,10 @@
True
True
+
+ True
+ True
+
@@ -1837,26 +1857,6 @@
-
- True
- True
-
-
- True
- True
-
-
- True
- True
-
-
- True
- True
-
-
- True
- True
-
diff --git a/Builds/VisualStudio2013/RippleD.vcxproj.filters b/Builds/VisualStudio2013/RippleD.vcxproj.filters
index d600d26871..f41e58e763 100644
--- a/Builds/VisualStudio2013/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2013/RippleD.vcxproj.filters
@@ -259,18 +259,12 @@
{C4BDB9F8-7DB7-E304-D286-098085D5D16E}
-
- {815DC1A2-E2EF-E6E3-D979-19AD1476A28B}
-
{03533509-DAC6-636F-9F7E-288894549E95}
{9AD8D049-10A8-704C-D51A-FAD55B1F235F}
-
- {1025719B-6A8F-D9FB-A6BA-02B93756DE09}
-
{2E791662-6ED0-D1E1-03A4-0CB35473EC56}
@@ -280,9 +274,6 @@
{4849F8A8-26D5-8416-2D59-F4CA49F0100C}
-
- {9F69C81C-840B-8296-2595-D669EC736BED}
-
{B8720E2F-21B1-2847-F96C-4E00A45DC639}
@@ -2322,12 +2313,6 @@
ripple\app\misc
-
- ripple\app\misc\tests
-
-
- ripple\app\misc\tests
-
ripple\app\misc
@@ -2445,21 +2430,42 @@
ripple\app\paths
-
- ripple\app\paths\tests
-
ripple\app\paths
ripple\app\paths
+
+ ripple\app\tests
+
+
+ ripple\app\tests
+
+
+ ripple\app\tests
+
+
+ ripple\app\tests
+
+
+ ripple\app\tests
+
+
+ ripple\app\tests
+
+
+ ripple\app\tests
+
ripple\app\tests
ripple\app\tests
+
+ ripple\app\tests
+
ripple\app\tx
@@ -2592,21 +2598,6 @@
ripple\app\tx
-
- ripple\app\tx\tests
-
-
- ripple\app\tx\tests
-
-
- ripple\app\tx\tests
-
-
- ripple\app\tx\tests
-
-
- ripple\app\tx\tests
-
ripple\app\tx
diff --git a/src/ripple/app/misc/tests/AccountTxPaging.test.cpp b/src/ripple/app/tests/AccountTxPaging.test.cpp
similarity index 100%
rename from src/ripple/app/misc/tests/AccountTxPaging.test.cpp
rename to src/ripple/app/tests/AccountTxPaging.test.cpp
diff --git a/src/ripple/app/misc/tests/AmendmentTable.test.cpp b/src/ripple/app/tests/AmendmentTable.test.cpp
similarity index 100%
rename from src/ripple/app/misc/tests/AmendmentTable.test.cpp
rename to src/ripple/app/tests/AmendmentTable.test.cpp
diff --git a/src/ripple/app/tx/tests/DeliverMin.test.cpp b/src/ripple/app/tests/DeliverMin.test.cpp
similarity index 100%
rename from src/ripple/app/tx/tests/DeliverMin.test.cpp
rename to src/ripple/app/tests/DeliverMin.test.cpp
diff --git a/src/ripple/app/tx/tests/MultiSign.test.cpp b/src/ripple/app/tests/MultiSign.test.cpp
similarity index 100%
rename from src/ripple/app/tx/tests/MultiSign.test.cpp
rename to src/ripple/app/tests/MultiSign.test.cpp
diff --git a/src/ripple/app/tx/tests/Offer.test.cpp b/src/ripple/app/tests/Offer.test.cpp
similarity index 100%
rename from src/ripple/app/tx/tests/Offer.test.cpp
rename to src/ripple/app/tests/Offer.test.cpp
diff --git a/src/ripple/app/tx/tests/OfferStream.test.cpp b/src/ripple/app/tests/OfferStream.test.cpp
similarity index 100%
rename from src/ripple/app/tx/tests/OfferStream.test.cpp
rename to src/ripple/app/tests/OfferStream.test.cpp
diff --git a/src/ripple/app/paths/tests/Path_test.cpp b/src/ripple/app/tests/Path_test.cpp
similarity index 100%
rename from src/ripple/app/paths/tests/Path_test.cpp
rename to src/ripple/app/tests/Path_test.cpp
diff --git a/src/ripple/app/tx/tests/Taker.test.cpp b/src/ripple/app/tests/Taker.test.cpp
similarity index 100%
rename from src/ripple/app/tx/tests/Taker.test.cpp
rename to src/ripple/app/tests/Taker.test.cpp
diff --git a/src/ripple/unity/app_misc.cpp b/src/ripple/unity/app_misc.cpp
index 8a1fad248c..599f417ae9 100644
--- a/src/ripple/unity/app_misc.cpp
+++ b/src/ripple/unity/app_misc.cpp
@@ -29,6 +29,3 @@
#include
#include
-
-#include
-#include
diff --git a/src/ripple/unity/app_paths.cpp b/src/ripple/unity/app_paths.cpp
index ab8cb42a66..7f7fb3a20e 100644
--- a/src/ripple/unity/app_paths.cpp
+++ b/src/ripple/unity/app_paths.cpp
@@ -41,5 +41,3 @@
#include
#include
#include
-
-#include
diff --git a/src/ripple/unity/app_tests.cpp b/src/ripple/unity/app_tests.cpp
index dad4846a1b..8c110a2baa 100644
--- a/src/ripple/unity/app_tests.cpp
+++ b/src/ripple/unity/app_tests.cpp
@@ -21,3 +21,11 @@
#include
#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
diff --git a/src/ripple/unity/app_tx.cpp b/src/ripple/unity/app_tx.cpp
index 16a1168ade..070acdd4c2 100644
--- a/src/ripple/unity/app_tx.cpp
+++ b/src/ripple/unity/app_tx.cpp
@@ -42,9 +42,3 @@
#include
#include
#include
-
-#include
-#include
-#include
-#include
-#include