Merge "Fix test files created during execution"