diff --git a/unit_tests/server/parameters_parser.cpp b/unit_tests/server/parameters_parser.cpp
index 152e3a121..b2a42dd99 100644
--- a/unit_tests/server/parameters_parser.cpp
+++ b/unit_tests/server/parameters_parser.cpp
@@ -93,7 +93,7 @@ BOOST_AUTO_TEST_CASE(invalid_route_urls)
         testInvalidOptions<engine::api::RouteParameters>("1,2;3,4?overview=false&radiuses=foo"),
         32UL);
     BOOST_CHECK_EQUAL(
-        testInvalidOptions<engine::api::RouteParameters>("1,2;3,4?overview=false&hints=foo"), 22UL);
+        testInvalidOptions<engine::api::RouteParameters>("1,2;3,4?overview=false&hints=foo"), 29UL);
     BOOST_CHECK_EQUAL(
         testInvalidOptions<engine::api::RouteParameters>("1,2;3,4?overview=false&geometries=foo"),
         22UL);
@@ -102,7 +102,7 @@ BOOST_AUTO_TEST_CASE(invalid_route_urls)
         22L);
     BOOST_CHECK_EQUAL(
         testInvalidOptions<engine::api::RouteParameters>("1,2;3,4?overview=false&alternatives=foo"),
-        22UL);
+        36UL);
 }
 
 BOOST_AUTO_TEST_CASE(invalid_table_urls)
@@ -114,9 +114,10 @@ BOOST_AUTO_TEST_CASE(invalid_table_urls)
     BOOST_CHECK_EQUAL(testInvalidOptions<engine::api::TableParameters>(
                           "1,2;3,4?sources=1&destinations=1&bla=foo"),
                       32UL);
-    BOOST_CHECK_EQUAL(testInvalidOptions<engine::api::TableParameters>("1,2;3,4?sources=foo"), 7UL);
+    BOOST_CHECK_EQUAL(testInvalidOptions<engine::api::TableParameters>("1,2;3,4?sources=foo"),
+                      16UL);
     BOOST_CHECK_EQUAL(testInvalidOptions<engine::api::TableParameters>("1,2;3,4?destinations=foo"),
-                      7UL);
+                      21UL);
 }
 
 BOOST_AUTO_TEST_CASE(valid_route_urls)
diff --git a/unit_tests/server/url_parser.cpp b/unit_tests/server/url_parser.cpp
index 140567481..cca1f6103 100644
--- a/unit_tests/server/url_parser.cpp
+++ b/unit_tests/server/url_parser.cpp
@@ -19,8 +19,8 @@ std::ostream &operator<<(std::ostream &out, const osrm::server::api::ParsedURL &
 }
 }
 
-#include <boost/test/unit_test.hpp>
 #include <boost/test/test_tools.hpp>
+#include <boost/test/unit_test.hpp>
 
 #define CHECK_EQUAL_RANGE(R1, R2)                                                                  \
     BOOST_CHECK_EQUAL_COLLECTIONS(R1.begin(), R1.end(), R2.begin(), R2.end());
@@ -41,12 +41,12 @@ std::size_t testInvalidURL(std::string url)
 
 BOOST_AUTO_TEST_CASE(invalid_urls)
 {
-    BOOST_CHECK_EQUAL(testInvalidURL("/route/"), 0UL);
-    BOOST_CHECK_EQUAL(testInvalidURL("/route/bla"), 0UL);
-    BOOST_CHECK_EQUAL(testInvalidURL("/route/1/1,2;3;4"), 0UL);
-    BOOST_CHECK_EQUAL(testInvalidURL("/route/v1/pro_file/1,2;3,4"), 0UL);
-    BOOST_CHECK_EQUAL(testInvalidURL("/route/v1/profile"), 0UL);
-    BOOST_CHECK_EQUAL(testInvalidURL("/route/v1/profile/"), 0UL);
+    BOOST_CHECK_EQUAL(testInvalidURL("/route/"), 7UL);
+    BOOST_CHECK_EQUAL(testInvalidURL("/route/bla"), 7UL);
+    BOOST_CHECK_EQUAL(testInvalidURL("/route/1/1,2;3;4"), 7UL);
+    BOOST_CHECK_EQUAL(testInvalidURL("/route/v1/pro_file/1,2;3,4"), 13UL);
+    BOOST_CHECK_EQUAL(testInvalidURL("/route/v1/profile"), 17UL);
+    BOOST_CHECK_EQUAL(testInvalidURL("/route/v1/profile/"), 18UL);
 }
 
 BOOST_AUTO_TEST_CASE(valid_urls)