Fix tests to consider the flavor in the name