Restructure graph tests to be more like a reference