Add more mocking of API calls