Merge "Clean up files that were being leaked by unit tests"