Move request/responses over to utils/stubs
Big test clean up and refactoring