Merge "Enable one flavor tests"