Tidy up the endpoints based on tests from strong-gateway