fixing failing tests
Merge pull request #1 from jethroo/fix/fixing_travis_build

fixing failing tests