Merge "Adds 3 additional tests to test_flavor.py script"