Make tests more portable