Fix tests for CircleCI