Fixes failing tests on travis