Tweaks to test output + intensity