Fixes more tests.