Make tests portable