Fixing some more unit tests.