Merge "Add tests to cover flavors"