Removed BAD_REQUEST. Close #118

All tests updated.