reorder model tests