Fixing test failures.