Fix up nightly tests