Fix tests for latest nightly