Fixing up tests for upgrade.