Fixing existing unit tests.