Fixed test for ApiClient, working on mock_calls in AwsCollection.