Merge "Fix "create a flavor" tests for strong validation"