added tests
Merge pull request #1 from dotch/master

added tests