Fixed saving of original ids in graphs
Added outputs in cluster tests