Make tests pass on nightly