more tests updates
Merge pull request #23 from ugexe/tests

more tests updates