Added upgrades to tests