Fixing additional tests.