Merge "Fix flavors tests so they can be run in parallel"