Implement upgrade functional tests

[jschmid1]

Description of Issue/Question

We really need functional tests for the upgrade functionality. That's one of the last big spots in the project we miss proper tests in.

---

I think @smithfarm has already started implementing something, maybe you can share your progress here.