Merge "Add unit test for flavors_client"