Fixing Broken tests

This PR attempts to fix broken tests caused by the change in available flavors.