Merge "Add tests for adding/removing flavor access"