Added a bunch more to graph test, which passes