Fix upgrade test