Switch to using request, additional specs, and a bit less code by switching and trusting request to the web api