Merge "Add another vfm-upgrade test"