update tests
fix tests using regexp
Merge pull request #4 from UFOMelkor/tests

update tests