Fixing Travis CI test issues