Tweaks to test case output + new variant