Tweaks to test configuration