Make tests a bit more order independent