Update generate graph method
Review tests
Update fix data
Review tests
Remove messages
Remove messages