Move requests to use mocks and fix errors that came up from proper testing