Merge "Add unit test for quotas_client"