Upgrade testing suite