Fixed failing tests on Travis CI