Update tests and build after merge.