Tweaks to test output