Fix the two remaining unit test failures.