* Replace CIS_ROOT_DIR by a more flexible system * Try to adapt the logic change to the functional tests