Fixed failing tests
Travis CI