CIMI tests: make cimi system scenario more generic and work on fgcp