Fix tests so that they run on the Travis-CI server