Rename tests
Improve use of HTTP status codes