diff --git a/test_cases/alphanumeric_housenumber.json b/test_cases/search_alphanumeric_housenumber.json
similarity index 56%
rename from test_cases/alphanumeric_housenumber.json
rename to test_cases/search_alphanumeric_housenumber.json
index 58fb8da..7d07fd8 100644
--- a/test_cases/alphanumeric_housenumber.json
+++ b/test_cases/search_alphanumeric_housenumber.json
@@ -1,12 +1,13 @@
 {
-  "name": "Alphanumeric housenumbers",
-  "priorityThresh": 5,
+  "name": "Search Alphanumeric housenumbers",
+  "priorityThresh": 1,
   "normalizers": {
     "name": [
       "toLowerCase"
     ],
     "housenumber": [
-      "toLowerCase"
+      "toLowerCase",
+      "stripPunctuation"
     ],
     "street": [
       "toLowerCase"
@@ -89,7 +90,7 @@
       "id": 3,
       "status": "pass",
       "in": {
-        "text": "15А Комсомольская улица minsk belarus"
+        "text": "15А Камсамольская вуліца minsk belarus"
       },
       "description": "Belarusian address written the localized way. Note the Cyrillic character in the query and expected result",
       "issue": "https://github.com/pelias/pelias/issues/833",
@@ -97,7 +98,7 @@
         "properties": [
           {
             "housenumber": "15А",
-            "street": "Комсомольская улица",
+            "street": "Камсамольская вуліца",
             "region": "Minsk",
             "country_a": "BLR"
           }
@@ -108,7 +109,7 @@
       "id": "3.1",
       "status": "pass",
       "in": {
-        "text": "Комсомольская улица 15А minsk belarus"
+        "text": "Камсамольская вуліца 15А minsk belarus"
       },
       "description": "Belarusian address written the 'American' way. Note the Cyrillic character in the query and expected result",
       "issue": "https://github.com/pelias/pelias/issues/833",
@@ -116,7 +117,7 @@
         "properties": [
           {
             "housenumber": "15А",
-            "street": "Комсомольская улица",
+            "street": "Камсамольская вуліца",
             "region": "Minsk",
             "country_a": "BLR"
           }
@@ -177,6 +178,113 @@
           }
         ]
       }
+    },
+    {
+      "id": 6,
+      "status": "pass",
+      "in": {
+        "text": "kinkerstraat 175F, amsterdam"
+      },
+      "description": "Dutch address in a building with housenumbers like 175A, 175B, 175C, etc. Without proper sorting the desired result can easily be drowned out",
+      "expected": {
+        "properties": [
+          {
+            "housenumber": "175F",
+            "street": "Kinkerstraat",
+            "locality": "Amsterdam",
+            "country_a": "NLD"
+          }
+        ]
+      }
+    },
+    {
+      "id": "6.1",
+      "status": "fail",
+      "in": {
+        "text": "kinkerstraat 175 F, amsterdam"
+      },
+      "description": "As above, we currently dont support permutations of the unit number, as in this example with a space",
+      "expected": {
+        "properties": [
+          {
+            "housenumber": "175F",
+            "street": "Kinkerstraat",
+            "locality": "Amsterdam",
+            "country_a": "NLD"
+          }
+        ]
+      }
+    },
+    {
+      "id": 7,
+      "status": "pass",
+      "in": {
+        "text": "Vanadiumweg 11C, Amersfoort"
+      },
+      "description": "Dutch address in a building with housenumbers like 175A, 175B, 175C, etc. Without proper sorting the desired result can easily be drowned out",
+      "expected": {
+        "properties": [
+          {
+            "housenumber": "11C",
+            "street": "Vanadiumweg",
+            "locality": "Amersfoort",
+            "country_a": "NLD"
+          }
+        ]
+      }
+    },
+    {
+      "id": "7.1",
+      "status": "pass",
+      "in": {
+        "text": "Vanadiumweg 11, Amersfoort"
+      },
+      "description": "Expect the housenumber 11 (with no unit suffix) to appear before those with a unit suffix",
+      "expected": {
+        "properties": [
+          {
+            "housenumber": "11",
+            "street": "Vanadiumweg",
+            "locality": "Amersfoort",
+            "country_a": "NLD"
+          }
+        ]
+      }
+    },
+    {
+      "id": 8,
+      "status": "pass",
+      "in": {
+        "text": "봉화로167번길 35-7"
+      },
+      "description": "Korean address, there are multiple units at 35-* but none at 35",
+      "expected": {
+        "properties": [
+          {
+            "housenumber": "35-7",
+            "street": "봉화로167번길",
+            "country_a": "KOR"
+          }
+        ]
+      }
+    },
+    {
+      "id": "8.1",
+      "status": "pass",
+      "in": {
+        "text": "봉화로167번길 35"
+      },
+      "description": "As above, query is for 35 without unit suffix. Sorting is arbitrary.",
+      "expected": {
+        "priorityThresh": 10,
+        "properties": [
+          {
+            "housenumber": "35-7",
+            "street": "봉화로167번길",
+            "country_a": "KOR"
+          }
+        ]
+      }
     }
   ]
 }