Fixing unit tests.