fixing tests
merging upstream changes
file cleanup
Merge pull request #28 from serened/file_cleanup

File cleanup