Improving CircleCI tests