Merge "Re-enable 3 flavor tests"