Added a few new tests and a new suite for upgrades