Merge "Add flavor extra spec validation tests"