Tweaks to the TestGui class