Fixing CircleCI tests