Fix tests and graph