Small fixes
[#21] Add tests