Better test for FileSerializer
More unit testing
Merge pull request #26 from futures/ImproverateUnitTests

Improverate unit tests