More tests
Merge pull request #24 from phadej/more-tests

More tests