Fix existing tests.