Bunch of cleanup work, and adding of graph test files.