Fixed 2 test failures.