Fix tests on Travis?