CARE #91: Fixed excluding test flws for empty where groups