Fix some tests I missed in the last commit.