Merge "add flavor creation tests"