fixing tests
Merge pull request #122 from swampie/master

fixing tests