Clean up temp files if we encounter an error

Thanks to @tv42 for spotting.
Get rid of output during tests