diff --git a/appveyor-build.bat b/appveyor-build.bat
index 203534fea0e..5cb9a03b7b3 100644
--- a/appveyor-build.bat
+++ b/appveyor-build.bat
@@ -134,21 +134,22 @@ IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
 ECHO running library-tests.exe ...
 SET test_region=berlin
+SET test_region_ch=ch\berlin
+SET test_region_corech=corech\berlin
+SET test_region_mld=mld\berlin
 SET test_osm=%test_region%.osm.pbf
-SET test_osm_ch=%test_region%_CH.osm.pbf
-SET test_osm_corech=%test_region%_CoreCH.osm.pbf
-SET test_osm_mld=%test_region%_MLD.osm.pbf
 IF NOT EXIST %test_osm% powershell Invoke-WebRequest https://s3.amazonaws.com/mapbox/osrm/testing/berlin.osm.pbf -OutFile %test_osm%
-COPY %test_osm% %test_osm_ch%
-COPY %test_osm% %test_osm_corech%
-COPY %test_osm% %test_osm_mld%
-%Configuration%\osrm-extract.exe -p ../profiles/car.lua %test_osm_ch%
-%Configuration%\osrm-extract.exe -p ../profiles/car.lua %test_osm_corech%
-%Configuration%\osrm-extract.exe -p ../profiles/car.lua %test_osm_mld%
+%Configuration%\osrm-extract.exe -p ../profiles/car.lua %test_osm%
+MKDIR ch
+XCOPY %test_region%.osrm %test_region%.osrm.* ch\
+MKDIR corech
+XCOPY %test_region%.osrm %test_region%.osrm.* corech\
+MKDIR mld
+XCOPY %test_region%.osrm %test_region%.osrm.* mld\
 %Configuration%\osrm-contract.exe %test_region_ch%.osrm
 %Configuration%\osrm-contract.exe --core 0.8 %test_region_corech%.osrm
-%Configuration%\osrm-contract.exe %test_region_mld%.osrm
 %Configuration%\osrm-partition.exe %test_region_mld%.osrm
+%Configuration%\osrm-customize.exe %test_region_mld%.osrm
 unit_tests\%Configuration%\library-tests.exe
 
 IF NOT "%APPVEYOR_REPO_BRANCH%"=="master" GOTO DONE
diff --git a/appveyor.yml b/appveyor.yml
index 0e6b00f3cc4..19730b2deb7 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -23,7 +23,7 @@ build_script:
 before_test:
   - node --version
   - npm --version
-  - npm install
+  - npm install --ignore-scripts
   - npm link
   - SET PATH=%CD%\osrm-deps\libs\bin;%PATH%
   - SET OSRM_BUILD_DIR=build\%Configuration%
diff --git a/scripts/poly2req.js b/scripts/poly2req.js
index e2dd3fc4ddd..0572d71b73c 100755
--- a/scripts/poly2req.js
+++ b/scripts/poly2req.js
@@ -6,7 +6,7 @@ let fs = require('fs');  // Node 4.x required!
 
 let VERSION = "route_5.0";
 let SAMPLE_SIZE = 20;
-let NUM_REQUEST = 1000;
+let NUM_REQUEST = 100;
 let NUM_COORDS = 2;
 let PORT = 5000;
 let url_templates = {
diff --git a/test/data/Makefile b/test/data/Makefile
index 0ae4774d4cd..5cbcb40266d 100755
--- a/test/data/Makefile
+++ b/test/data/Makefile
@@ -16,7 +16,7 @@ PROFILE:=$(PROFILE_ROOT)/car.lua
 
 all: data
 
-data: $(DATA_NAME)_CH.osrm.hsgr $(DATA_NAME)_CoreCH.osrm.hsgr $(DATA_NAME)_MLD.osrm.partition
+data: ch/$(DATA_NAME).osrm.hsgr corech/$(DATA_NAME).osrm.hsgr mld/$(DATA_NAME).osrm.partition
 
 clean:
 	-rm $(DATA_NAME).*
@@ -25,27 +25,36 @@ clean:
 $(DATA_NAME).osm.pbf:
 	wget $(DATA_URL) -O $(DATA_NAME).osm.pbf
 
-$(DATA_NAME)_%.osm.pbf: $(DATA_NAME).osm.pbf
-	cp $< $@
-
 $(DATA_NAME).poly:
 	wget $(DATA_POLY_URL) -O $(DATA_NAME).poly
 
-$(DATA_NAME)_%.osrm: $(DATA_NAME)_%.osm.pbf $(DATA_NAME).poly $(PROFILE) $(OSRM_EXTRACT)
+ch/$(DATA_NAME).osrm: $(DATA_NAME).osrm
+	mkdir -p ch
+	cp $(DATA_NAME).osrm $(DATA_NAME).osrm.* ch/
+
+corech/$(DATA_NAME).osrm: $(DATA_NAME).osrm
+	mkdir -p corech
+	cp $(DATA_NAME).osrm $(DATA_NAME).osrm.* corech/
+
+mld/$(DATA_NAME).osrm: $(DATA_NAME).osrm
+	mkdir -p mld
+	cp $(DATA_NAME).osrm $(DATA_NAME).osrm.* mld/
+
+$(DATA_NAME).osrm: $(DATA_NAME).osm.pbf $(DATA_NAME).poly $(PROFILE) $(OSRM_EXTRACT)
 	@echo "Verifiyng data file integrity..."
 	$(MD5SUM) -c data.md5sum
 	@echo "Running osrm-extract..."
 	$(TIMER) "osrm-extract\t$@" $(OSRM_EXTRACT) $< -p $(PROFILE)
 
-$(DATA_NAME)_CH.osrm.hsgr: $(DATA_NAME)_CH.osrm $(PROFILE) $(OSRM_CONTRACT)
+ch/$(DATA_NAME).osrm.hsgr: ch/$(DATA_NAME).osrm $(PROFILE) $(OSRM_CONTRACT)
 	@echo "Running osrm-contract..."
 	$(TIMER) "osrm-contract\t$@" $(OSRM_CONTRACT) $<
 
-$(DATA_NAME)_CoreCH.osrm.hsgr: $(DATA_NAME)_CoreCH.osrm $(PROFILE) $(OSRM_CONTRACT)
+corech/$(DATA_NAME).osrm.hsgr: corech/$(DATA_NAME).osrm $(PROFILE) $(OSRM_CONTRACT)
 	@echo "Running osrm-contract..."
-	$(TIMER) "osrm-contract\t$@" $(OSRM_CONTRACT) --core=0.2 $<
+	$(TIMER) "osrm-contract\t$@" $(OSRM_CONTRACT) --core=0.5 $<
 
-$(DATA_NAME)_MLD.osrm.partition: $(DATA_NAME)_MLD.osrm $(PROFILE) $(OSRM_PARTITION)
+mld/$(DATA_NAME).osrm.partition: mld/$(DATA_NAME).osrm $(PROFILE) $(OSRM_PARTITION)
 	@echo "Running osrm-partition..."
 	$(TIMER) "osrm-partition\t$@" $(OSRM_PARTITION) $<
 	$(TIMER) "osrm-customize\t$@" $(OSRM_CUSTOMIZE) $<
@@ -55,17 +64,17 @@ $(DATA_NAME).requests: $(DATA_NAME).poly
 
 benchmark: data $(DATA_NAME).requests
 	@echo "Running benchmark..."
-	@/bin/sh -c '$(OSRM_ROUTED) --algorithm=CH $(DATA_NAME)_CH.osrm > /dev/null & echo "$$!" > osrm-routed.pid'
+	@/bin/sh -c '$(OSRM_ROUTED) --algorithm=CH ch/$(DATA_NAME).osrm > /dev/null & echo "$$!" > osrm-routed.pid'
 	@sleep 1
 	$(TIMER) "queries\tCH" "cat $(DATA_NAME).requests | xargs curl &> /dev/null"
 	@cat osrm-routed.pid | xargs kill
 	@rm osrm-routed.pid
-	@/bin/sh -c '$(OSRM_ROUTED) --algorithm=CoreCH $(DATA_NAME)_CoreCH.osrm > /dev/null & echo "$$!" > osrm-routed.pid'
+	@/bin/sh -c '$(OSRM_ROUTED) --algorithm=CoreCH corech/$(DATA_NAME).osrm > /dev/null & echo "$$!" > osrm-routed.pid'
 	@sleep 1
 	$(TIMER) "queries\tCoreCH" "cat $(DATA_NAME).requests | xargs curl &> /dev/null"
 	@cat osrm-routed.pid | xargs kill
 	@rm osrm-routed.pid
-	@/bin/sh -c '$(OSRM_ROUTED) --algorithm=MLD $(DATA_NAME)_MLD.osrm > /dev/null & echo "$$!" > osrm-routed.pid'
+	@/bin/sh -c '$(OSRM_ROUTED) --algorithm=MLD mld/$(DATA_NAME).osrm > /dev/null & echo "$$!" > osrm-routed.pid'
 	@sleep 1
 	$(TIMER) "queries\tMLD" "cat $(DATA_NAME).requests | xargs curl &> /dev/null"
 	@cat osrm-routed.pid | xargs kill
diff --git a/test/nodejs/osrm-data-path.js b/test/nodejs/osrm-data-path.js
index 713aa28cb68..b6220b7641c 100644
--- a/test/nodejs/osrm-data-path.js
+++ b/test/nodejs/osrm-data-path.js
@@ -1,8 +1,8 @@
 var path = require('path');
 
 if (process.env.OSRM_DATA_PATH !== undefined) {
-    exports.data_path = path.join(path.resolve(process.env.OSRM_DATA_PATH), "berlin_CH.osrm");
+    exports.data_path = path.join(path.resolve(process.env.OSRM_DATA_PATH), "ch/berlin.osrm");
     console.log('Setting custom data path to ' + exports.data_path);
 } else {
-    exports.data_path = path.resolve(path.join(__dirname, "../data/berlin_CH.osrm"));
+    exports.data_path = path.resolve(path.join(__dirname, "../data/ch/berlin.osrm"));
 }
diff --git a/unit_tests/library/limits.cpp b/unit_tests/library/limits.cpp
index d6edec10090..9172ede005b 100644
--- a/unit_tests/library/limits.cpp
+++ b/unit_tests/library/limits.cpp
@@ -28,7 +28,7 @@ BOOST_AUTO_TEST_CASE(test_trip_limits)
     using namespace osrm;
 
     EngineConfig config;
-    config.storage_config = {OSRM_TEST_DATA_DIR "/berlin_CH.osrm"};
+    config.storage_config = {OSRM_TEST_DATA_DIR "/ch/berlin.osrm"};
     config.use_shared_memory = false;
     config.max_locations_trip = 2;
 
@@ -55,7 +55,7 @@ BOOST_AUTO_TEST_CASE(test_route_limits)
     using namespace osrm;
 
     EngineConfig config;
-    config.storage_config = {OSRM_TEST_DATA_DIR "/berlin_CH.osrm"};
+    config.storage_config = {OSRM_TEST_DATA_DIR "/ch/berlin.osrm"};
     config.use_shared_memory = false;
     config.max_locations_viaroute = 2;
 
@@ -82,7 +82,7 @@ BOOST_AUTO_TEST_CASE(test_table_limits)
     using namespace osrm;
 
     EngineConfig config;
-    config.storage_config = {OSRM_TEST_DATA_DIR "/berlin_CH.osrm"};
+    config.storage_config = {OSRM_TEST_DATA_DIR "/ch/berlin.osrm"};
     config.use_shared_memory = false;
     config.max_locations_distance_table = 2;
 
@@ -109,7 +109,7 @@ BOOST_AUTO_TEST_CASE(test_match_limits)
     using namespace osrm;
 
     EngineConfig config;
-    config.storage_config = {OSRM_TEST_DATA_DIR "/berlin_CH.osrm"};
+    config.storage_config = {OSRM_TEST_DATA_DIR "/ch/berlin.osrm"};
     config.use_shared_memory = false;
     config.max_locations_map_matching = 2;
 
@@ -136,7 +136,7 @@ BOOST_AUTO_TEST_CASE(test_nearest_limits)
     using namespace osrm;
 
     EngineConfig config;
-    config.storage_config = {OSRM_TEST_DATA_DIR "/berlin_CH.osrm"};
+    config.storage_config = {OSRM_TEST_DATA_DIR "/ch/berlin.osrm"};
     config.use_shared_memory = false;
     config.max_results_nearest = 2;
 
diff --git a/unit_tests/library/match.cpp b/unit_tests/library/match.cpp
index 20626a3017f..0ce7ec2240e 100644
--- a/unit_tests/library/match.cpp
+++ b/unit_tests/library/match.cpp
@@ -19,7 +19,7 @@ BOOST_AUTO_TEST_CASE(test_match)
 {
     using namespace osrm;
 
-    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
+    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
 
     MatchParameters params;
     params.coordinates.push_back(get_dummy_location());
diff --git a/unit_tests/library/nearest.cpp b/unit_tests/library/nearest.cpp
index a4e5f6067ab..1f691ad7597 100644
--- a/unit_tests/library/nearest.cpp
+++ b/unit_tests/library/nearest.cpp
@@ -16,7 +16,7 @@ BOOST_AUTO_TEST_SUITE(nearest)
 
 BOOST_AUTO_TEST_CASE(test_nearest_response)
 {
-    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
+    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
 
     using namespace osrm;
 
@@ -43,7 +43,7 @@ BOOST_AUTO_TEST_CASE(test_nearest_response)
 
 BOOST_AUTO_TEST_CASE(test_nearest_response_no_coordinates)
 {
-    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
+    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
 
     using namespace osrm;
 
@@ -59,7 +59,7 @@ BOOST_AUTO_TEST_CASE(test_nearest_response_no_coordinates)
 
 BOOST_AUTO_TEST_CASE(test_nearest_response_multiple_coordinates)
 {
-    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
+    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
 
     using namespace osrm;
 
@@ -77,7 +77,7 @@ BOOST_AUTO_TEST_CASE(test_nearest_response_multiple_coordinates)
 
 BOOST_AUTO_TEST_CASE(test_nearest_response_for_location_in_small_component)
 {
-    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
+    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
 
     using namespace osrm;
 
diff --git a/unit_tests/library/options.cpp b/unit_tests/library/options.cpp
index 4889d6ae998..4743536faf1 100644
--- a/unit_tests/library/options.cpp
+++ b/unit_tests/library/options.cpp
@@ -14,7 +14,7 @@ BOOST_AUTO_TEST_CASE(test_ch)
     using namespace osrm;
     EngineConfig config;
     config.use_shared_memory = false;
-    config.storage_config = storage::StorageConfig(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
+    config.storage_config = storage::StorageConfig(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
     config.algorithm = EngineConfig::Algorithm::CH;
     OSRM osrm{config};
 }
@@ -24,7 +24,7 @@ BOOST_AUTO_TEST_CASE(test_corech)
     using namespace osrm;
     EngineConfig config;
     config.use_shared_memory = false;
-    config.storage_config = storage::StorageConfig(OSRM_TEST_DATA_DIR "/berlin_CoreCH.osrm");
+    config.storage_config = storage::StorageConfig(OSRM_TEST_DATA_DIR "/corech/berlin.osrm");
     config.algorithm = EngineConfig::Algorithm::CoreCH;
     OSRM osrm{config};
 }
@@ -34,7 +34,7 @@ BOOST_AUTO_TEST_CASE(test_mld)
     using namespace osrm;
     EngineConfig config;
     config.use_shared_memory = false;
-    config.storage_config = storage::StorageConfig(OSRM_TEST_DATA_DIR "/berlin_MLD.osrm");
+    config.storage_config = storage::StorageConfig(OSRM_TEST_DATA_DIR "/mld/berlin.osrm");
     config.algorithm = EngineConfig::Algorithm::MLD;
     OSRM osrm{config};
 }
diff --git a/unit_tests/library/route.cpp b/unit_tests/library/route.cpp
index e8df12c0afa..cdd2ba30161 100644
--- a/unit_tests/library/route.cpp
+++ b/unit_tests/library/route.cpp
@@ -17,7 +17,7 @@ BOOST_AUTO_TEST_SUITE(route)
 
 BOOST_AUTO_TEST_CASE(test_route_same_coordinates_fixture)
 {
-    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
+    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
 
     using namespace osrm;
 
@@ -97,7 +97,7 @@ BOOST_AUTO_TEST_CASE(test_route_same_coordinates_fixture)
 
 BOOST_AUTO_TEST_CASE(test_route_same_coordinates)
 {
-    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
+    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
 
     using namespace osrm;
 
@@ -249,7 +249,7 @@ BOOST_AUTO_TEST_CASE(test_route_same_coordinates)
 
 BOOST_AUTO_TEST_CASE(test_route_response_for_locations_in_small_component)
 {
-    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
+    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
 
     using namespace osrm;
 
@@ -284,7 +284,7 @@ BOOST_AUTO_TEST_CASE(test_route_response_for_locations_in_small_component)
 
 BOOST_AUTO_TEST_CASE(test_route_response_for_locations_in_big_component)
 {
-    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
+    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
 
     using namespace osrm;
 
@@ -319,7 +319,7 @@ BOOST_AUTO_TEST_CASE(test_route_response_for_locations_in_big_component)
 
 BOOST_AUTO_TEST_CASE(test_route_response_for_locations_across_components)
 {
-    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
+    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
 
     using namespace osrm;
 
@@ -356,7 +356,7 @@ BOOST_AUTO_TEST_CASE(test_route_response_for_locations_across_components)
 
 BOOST_AUTO_TEST_CASE(test_route_user_disables_generating_hints)
 {
-    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
+    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
 
     using namespace osrm;
 
@@ -376,7 +376,7 @@ BOOST_AUTO_TEST_CASE(test_route_user_disables_generating_hints)
 
 BOOST_AUTO_TEST_CASE(speed_annotation_matches_duration_and_distance)
 {
-    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
+    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
 
     using namespace osrm;
 
@@ -410,7 +410,7 @@ BOOST_AUTO_TEST_CASE(speed_annotation_matches_duration_and_distance)
 
 BOOST_AUTO_TEST_CASE(test_manual_setting_of_annotations_property)
 {
-    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
+    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
 
     using namespace osrm;
 
diff --git a/unit_tests/library/table.cpp b/unit_tests/library/table.cpp
index b3834c70620..6f4f82a82b2 100644
--- a/unit_tests/library/table.cpp
+++ b/unit_tests/library/table.cpp
@@ -19,7 +19,7 @@ BOOST_AUTO_TEST_CASE(test_table_three_coords_one_source_one_dest_matrix)
 {
     using namespace osrm;
 
-    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
+    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
 
     TableParameters params;
     params.coordinates.push_back(get_dummy_location());
@@ -66,7 +66,7 @@ BOOST_AUTO_TEST_CASE(test_table_three_coords_one_source_matrix)
 {
     using namespace osrm;
 
-    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
+    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
 
     TableParameters params;
     params.coordinates.push_back(get_dummy_location());
@@ -113,7 +113,7 @@ BOOST_AUTO_TEST_CASE(test_table_three_coordinates_matrix)
 {
     using namespace osrm;
 
-    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
+    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
 
     TableParameters params;
     params.coordinates.push_back(get_dummy_location());
diff --git a/unit_tests/library/tile.cpp b/unit_tests/library/tile.cpp
index 69e75541228..a1ce052c3f9 100644
--- a/unit_tests/library/tile.cpp
+++ b/unit_tests/library/tile.cpp
@@ -24,7 +24,7 @@ BOOST_AUTO_TEST_CASE(test_tile)
 {
     using namespace osrm;
 
-    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
+    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
 
     // Tile within Berlin dataset at Hackescher Markt (13.40294, 52.52330)
     TileParameters params{140831, 85967, 18};
@@ -216,7 +216,7 @@ BOOST_AUTO_TEST_CASE(test_tile_turns)
 {
     using namespace osrm;
 
-    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
+    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
 
     // Tile within Berlin dataset at Hackescher Markt (13.40294, 52.52330)
     TileParameters params{140831, 85967, 18};
@@ -366,7 +366,7 @@ BOOST_AUTO_TEST_CASE(test_tile_speeds)
 {
     using namespace osrm;
 
-    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
+    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
 
     // Small tile so we can test all the values
     // TileParameters params{272953, 191177, 19};
diff --git a/unit_tests/library/trip.cpp b/unit_tests/library/trip.cpp
index fd63954e7c0..d213bf3e203 100644
--- a/unit_tests/library/trip.cpp
+++ b/unit_tests/library/trip.cpp
@@ -18,7 +18,7 @@ BOOST_AUTO_TEST_CASE(test_roundtrip_response_for_locations_in_small_component)
 {
     using namespace osrm;
 
-    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
+    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
     const auto locations = get_locations_in_small_component();
 
     TripParameters params;
@@ -60,7 +60,7 @@ BOOST_AUTO_TEST_CASE(test_roundtrip_response_for_locations_in_big_component)
 {
     using namespace osrm;
 
-    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
+    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
     const auto locations = get_locations_in_big_component();
 
     TripParameters params;
@@ -102,7 +102,7 @@ BOOST_AUTO_TEST_CASE(test_roundtrip_response_for_locations_across_components)
 {
     using namespace osrm;
 
-    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
+    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
     const auto small = get_locations_in_small_component();
     const auto big = get_locations_in_big_component();
 
@@ -148,7 +148,7 @@ BOOST_AUTO_TEST_CASE(test_tfse_1)
 {
     using namespace osrm;
 
-    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
+    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
     const auto locations = get_locations_in_small_component();
 
     TripParameters params;
@@ -194,7 +194,7 @@ BOOST_AUTO_TEST_CASE(test_tfse_2)
 {
     using namespace osrm;
 
-    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
+    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
     const auto locations = get_locations_in_big_component();
 
     TripParameters params;
@@ -265,7 +265,7 @@ BOOST_AUTO_TEST_CASE(test_tfse_illegal_parameters)
 {
     using namespace osrm;
 
-    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
+    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
     const auto locations = get_locations_in_big_component();
     auto params = osrm::TripParameters();
 
@@ -315,7 +315,7 @@ BOOST_AUTO_TEST_CASE(test_tfse_illegal_parameters)
 BOOST_AUTO_TEST_CASE(test_tfse_legal_parameters)
 {
     using namespace osrm;
-    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
+    auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
     const auto locations = get_locations_in_big_component();
     json::Object result;
     TripParameters params;