More tests
Merge pull request #42 from kz363/master

More tests