Adding extra graph generator test
More bugfixes; more tests working