Minor fixes
Fix tests
Merge pull request #62 from marmelab/minor_fixes

[RFR] Minor fixes