diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake
index ba5ae4755..5048f6eb3 100644
--- a/src/server/sparkd/CMakeDeps.cmake
+++ b/src/server/sparkd/CMakeDeps.cmake
@@ -1 +1 @@
-set(sources ;fabric/Actor.cpp;fabric/Domain.cpp;fabric/Executor.cpp;fabric/IActor.cpp;fabric/IDomain.cpp;fabric/TopicDirectory.cpp;fabric/tests/baseline_perf_fabric_test.cpp;fabric/tests/fabric_test.cpp;grid/Node.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/store_tests.cpp;main.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/MDP3Utils.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;order_man/IFIXGateway.cpp;order_man/IOrderObserver.cpp;order_man/OldOrderMan.cpp;order_man/OrderMan.cpp;order_man/OrderState.cpp;order_man/OrderStore.cpp;order_man/WorkingOrder.cpp;order_man/components/MDSource.cpp;order_man/components/SecuritySource.cpp;order_man/events/TimeChange.cpp;order_man/fix_order_codec.cpp;order_man/order_man_utils.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SharedRiskLimiter.cpp;setup/BootstrapActor.cpp;setup/ServiceHostActor.cpp;spreader/SimpleSpreader.cpp;spreader/SpreaderBase.cpp;testing/catch_test_runner.cpp;user/UserServiceServer.cpp)
\ No newline at end of file
+set(sources ;fabric/Actor.cpp;fabric/Domain.cpp;fabric/Executor.cpp;fabric/IActor.cpp;fabric/IDomain.cpp;fabric/TopicDirectory.cpp;fabric/tests/baseline_perf_fabric_test.cpp;fabric/tests/fabric_test.cpp;grid/Node.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/store_tests.cpp;main.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/MDP3Utils.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;order_man/IFIXGateway.cpp;order_man/IOrderObserver.cpp;order_man/OldOrderMan.cpp;order_man/OrderMan.cpp;order_man/OrderState.cpp;order_man/OrderStore.cpp;order_man/WorkingOrder.cpp;order_man/components/MDSource.cpp;order_man/components/SecuritySource.cpp;order_man/events/TimeChange.cpp;order_man/fix_order_codec.cpp;order_man/order_man_utils.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SharedRiskLimiter.cpp;risk_limits/tests/RiskLimitsTests.cpp;setup/BootstrapActor.cpp;setup/ServiceHostActor.cpp;spreader/SimpleSpreader.cpp;spreader/SpreaderBase.cpp;testing/catch_test_runner.cpp;user/UserServiceServer.cpp)
\ No newline at end of file
diff --git a/src/server/sparkd/CMakeLists.txt b/src/server/sparkd/CMakeLists.txt
index dbd26e09d..1b910d58e 100644
--- a/src/server/sparkd/CMakeLists.txt
+++ b/src/server/sparkd/CMakeLists.txt
@@ -39,4 +39,4 @@ target_link_libraries( sparkd
# copy test data
file(COPY jetfix/tests/sample_fix.dat DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/test_data)
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/server/sparkd/sparkd.vcxproj b/src/server/sparkd/sparkd.vcxproj
index 3f6273a55..3a920a6aa 100644
--- a/src/server/sparkd/sparkd.vcxproj
+++ b/src/server/sparkd/sparkd.vcxproj
@@ -52,6 +52,7 @@
+
diff --git a/src/server/sparkd/sparkd.vcxproj.filters b/src/server/sparkd/sparkd.vcxproj.filters
index 8bd11b3e0..e72d51b56 100644
--- a/src/server/sparkd/sparkd.vcxproj.filters
+++ b/src/server/sparkd/sparkd.vcxproj.filters
@@ -58,6 +58,9 @@
{3ac2bf85-92ae-450e-8b7d-87515fa93fcd}
+
+ {a411842d-4a90-4b2f-81e1-c4f4083fd4f1}
+
@@ -199,6 +202,9 @@
risk_limits
+
+ risk_limits\tests
+