fixed last unit test failures.