Revert some of the circle.yml testing