Use fixture for standard graph

Also does some cleanup of imports (don't glob import), cleans up some
dict comprehensions, etc.