Tweaking upgrade test to improve reliability.