#34 more unit tests
Merge pull request #71 from danielwegener/more-coverage

#34 more unit tests