Added test upgrades and design
Added test upgrades and design2