Make tests less fragile