testsuite adapted to latest changes
Merge pull request #9 from jsuchome/master

testsuite adapted to latest changes