Fix all the tests on CircleCI