Cleared up unit test failures.