diff -r cf0f23803a53 -r 2dba812c7ef2 server/src/tests/Controllers/GeonamesControllerTest.php
--- a/server/src/tests/Controllers/GeonamesControllerTest.php	Wed Nov 09 15:05:41 2016 +0100
+++ b/server/src/tests/Controllers/GeonamesControllerTest.php	Wed Nov 09 23:41:15 2016 +0100
@@ -70,10 +70,10 @@
             ->shouldReceive('getLabels')
             ->with(['abcdef','ghij'])
             ->once()
-            ->andThrow('CorpusParole\Services\GeonamesResolverException', "GeonamesId not in correct format", 400);
+            ->andThrow('CorpusParole\Services\GeonamesResolverException', "GeonamesId not in correct format", 500);
         $response = $this->get('/api/v1/resolvers/geonames/abcdef,ghij');
 
-        $this->assertResponseStatus(400);
+        $this->assertResponseStatus(500);
     }
 
 }