Remove test on cleanall
Add and fix graph stuff