A few minor refactors to the endpoint tests for clarity.