Fixed failing Travis-CI tests