MB-146 #Updated tests for flavors.sql