Using addCleanup.
Fixing test contents.
Merge pull request #43 from rolobio/polishing

Polishing