Fixed cleanup of temporary directories after tests.
Whitespace fixes.
Fixed a temporary file not disappearing properly.
Merge pull request #142 from ygra/file-system-cleanup

Properly clean up temporary files and directories during tests