test updates
Merge pull request #27 from ugexe/tests

test updates