Fix tests and added test graphs