Cleaned up mocking of requests in test_app

ready for some review