Fix upgrade tests.