Merge "Clean Up tmp file from tests" into oc-dev