cfengine test updates for FC1 and FC2 (and RHL9, 8.0)