diff --git a/Makefile b/Makefile
index 21bc2e7eb..21545928d 100644
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,7 @@ build: generate build-js build-go
 install: install-bin install-assets
 test: test-js test-go
 test-go: reset-testdb run-test-go
+test-pkg: reset-testdb run-test-pkg
 test-api: reset-testdb run-test-api
 test-short: reset-testdb run-test-short
 acceptance-private-run-chromium: acceptance-private-restart acceptance-private acceptance-private-stop
@@ -164,6 +165,9 @@ run-test-short:
 run-test-go:
 	$(info Running all Go unit tests...)
 	$(GOTEST) -parallel 1 -count 1 -cpu 1 -tags slow -timeout 20m ./pkg/... ./internal/...
+run-test-pkg:
+	$(info Running all Go unit tests in '/pkg'...)
+	$(GOTEST) -parallel 2 -count 1 -cpu 2 -tags slow -timeout 20m ./pkg/...
 run-test-api:
 	$(info Running all API unit tests...)
 	$(GOTEST) -parallel 2 -count 1 -cpu 2 -tags slow -timeout 20m ./internal/api/...
diff --git a/pkg/txt/states.go b/pkg/txt/states.go
index 0f294f0b5..653b9dfa3 100644
--- a/pkg/txt/states.go
+++ b/pkg/txt/states.go
@@ -58,22 +58,36 @@ var StatesCA = LookupTable{
 
 // StatesDE maps common abbreviations for German states.
 var StatesDE = LookupTable{
-	"BW": "Baden-Württemberg",
-	"BY": "Bayern",
-	"BE": "Berlin",
-	"BB": "Brandenburg",
-	"HB": "Bremen",
-	"HH": "Hamburg",
-	"HE": "Hessen",
-	"NI": "Niedersachsen",
-	"MV": "Mecklenburg-Vorpommern",
-	"NW": "Nordrhein-Westfalen",
-	"RP": "Rheinland-Pfalz",
-	"SL": "Saarland",
-	"SN": "Sachsen",
-	"ST": "Sachsen-Anhalt",
-	"SH": "Schleswig-Holstein",
-	"TH": "Thüringen",
+	"BW":                     "Baden-Württemberg",
+	"Baden-Wurttemberg":      "Baden-Württemberg",
+	"BY":                     "Bayern",
+	"Bavaria":                "Bayern",
+	"BE":                     "Berlin",
+	"BER":                    "Berlin",
+	"BB":                     "Brandenburg",
+	"HB":                     "Bremen",
+	"HH":                     "Hamburg",
+	"HE":                     "Hessen",
+	"NI":                     "Niedersachsen",
+	"Lower Saxony":           "Niedersachsen",
+	"Lower-Saxony":           "Niedersachsen",
+	"MV":                     "Mecklenburg-Vorpommern",
+	"NW":                     "Nordrhein-Westfalen",
+	"NRW":                    "Nordrhein-Westfalen",
+	"North Rhine-Westphalia": "Nordrhein-Westfalen",
+	"RP":                     "Rheinland-Pfalz",
+	"Rhineland-Palatinate":   "Rheinland-Pfalz",
+	"SL":                     "Saarland",
+	"SN":                     "Sachsen",
+	"Saxony":                 "Sachsen",
+	"ST":                     "Sachsen-Anhalt",
+	"Saxony-Anhalt":          "Sachsen-Anhalt",
+	"Saxony Anhalt":          "Sachsen-Anhalt",
+	"Sachsen Anhalt":         "Sachsen-Anhalt",
+	"SH":                     "Schleswig-Holstein",
+	"TH":                     "Thüringen",
+	"Thuringia":              "Thüringen",
+	"Thuringen":              "Thüringen",
 }
 
 // StatesUS maps common abbreviations for US states.