Upgrade test for 5.16.1