Merge pull request #57 from korczis/tests

Add more tests