Added test case and fixed up integration between graph models