Fixed cleanup of temporary directories after tests.
Whitespace fixes.
Fixed a temporary file not disappearing properly.