Update cf-test-helpers to include calls to cf rather than gcf