Merge "Separate negative tests in flavors/test_flavors"