Fixed some disk upgrade tests that were testing the wrong thing