Reordered tests logically