Make tests consistent