Upgrade test 21