Cleanup some double-counted tests in replication2_upgrade.