Merge "WriterTest: remove output file after test completes"