Fixed up tests and docs for latest nightly.