tests fix
Merge pull request #2 from stxnext/master

Fixing tests.