Add test for upgrade from 6 to 7.
Make upgrade step title nicer.

No underscores needed here.