clean up output, fix throws/doesNotThrow