CIMI tests: small changes to make work against FGCP