Allow digits in tool names
Remove temporary output if it matches expected