Starting to clean up mock service. Adding integration tests for failure scenarios.