Clean up test cases a little bit
400 -> Bad Request