cmd/jujud: upgrades test refactoring

A bunch of refactoring of the tests relating to machine agent upgrades.
Nice. I really like this rename. I wouldn't of known I liked it without actually reading it, but it does help clarify the test.