Fixed more unit tests.