Fixed 5 unit test failures.