Update test to use new upgrade syntax.

Also remove some extra stuff that was not necessary.