added more tests
Merge pull request #36 from nikicat/master

added more tests