Fixed a couple test failures.