Fixing existing tests.