Reorder test helper methods