Cleaned up mocking of requests in test_app

@opyate any chance of one more before the weekend :)