Fix some deserialization issues
Seems to fix unit test issues

Not sure about this being the proper way to use input ranges, though...
Merge pull request #33 from msoucy/fix/unittests

Fix/unittests