Added missing graph shutdown calls to test suites
Resolved merge conflict