Upgrade tests for 0.8.7 (ticket 2439)

Only test changes.  Feel free to be brutally honest if I did something non-std or completely weird.