reorder rules to match tests