Refactoring graph, breaking tests