with-junit-output should use with-test-out when writing header and testsuites tags

Need to be able to use *test-out* and *out* independently within with-junit-output in order to be able to XML escape general test output while leaving report output (XML) alone.

with-junit-output currently precludes this because it doesn't use with-test-out when writing the header and testsuites tags. It assumes it will always be wrapped with with-test-out but this permenantly merges *test-out* and *out*