Fixed existing tests.