rewrote tests
Merge pull request #4 from domachine/fix/tests

test update