Reordered tests so that they pass consistently