Fixed tests
Merge pull request #115 from jeremyFreeAgent/fix/travis

Fixed tests