Fix tests that were broken during merge.