Add mode/system geom string generation;Refactor
Manual merge on tests