Tweaks for test configuration