CircleCI tests improved