Little fixes and new tests
Merge pull request #2 from paulakimenko/paulakimenko

Little fixes and new tests