diff --git a/t/match_info.t b/t/match_info.t
index 3e4b72c..1b6f8ef 100644
--- a/t/match_info.t
+++ b/t/match_info.t
@@ -50,7 +50,7 @@
 $t->get_ok('/corpus2/fail/x/x/p0-0')
   ->status_is(200)
   ->json_is('/notifications/0/0', 'error')
-  ->json_is('/notifications/0/1', '500: Internal Server Error')
+  ->json_is('/notifications/0/1', 'Unable to load query response from /home/ndiewald/Repositories/korap-git/Kalamar/t/fixtures/response_matchinfo_fail_x_x_p0-0.json')
   ;
 
 # TODO:
@@ -64,10 +64,11 @@
 # TODO:
 #   It's surprising, that it doesn't return a 404!
 $t->get_ok('/corpus2/notfound2/X/X/p0-1')
-  ->status_is(200)
+  ->status_is(404)
   ->json_is('/notifications/0/0', 'error')
   ->json_is('/notifications/0/1', '404: Not Found')
   ;
 
 
 done_testing;
+__END__
diff --git a/t/query.t b/t/query.t
index bf82ba2..4bc97dc 100644
--- a/t/query.t
+++ b/t/query.t
@@ -67,4 +67,11 @@
   ->text_is('li:nth-of-type(1) p.ref span.sigle', '[GOE/AGI/00000]')
   ;
 
+
+$t->get_ok('/q2?q=[orth=das')
+  ->status_is(400)
+  ->text_is('div.notify-error:nth-of-type(1)', '302: Parantheses/brackets unbalanced.')
+  ->text_like('div.notify-error:nth-of-type(2)', qr!302: Could not parse query .+? \[orth=das.+?!)
+  ;
+
 done_testing;