Fixed some test failures from last commit.