upgrade: fix up rgw tests a bit