Updated tests for Flavor(s)