I like this test.  I do remember seeing other tests for upgrade logic- I think for the bundles.  Maybe they can be combined in some way?