Upgrade test suite