Fixed and tested graph refinement