some more tests
Merge pull request #2 from timurn/master

some more tests
Some new tests