Trying to fix failing tests on travis.