R4R: Fixes Upgrades

tests for upgrades.