Some more categorize test refinements