Separated endpoint into its own variable on response.  Added back the tests