Fixing some existing unit tests.