Added some graph functionality and refactored some test-utils into collection.   Something is still wrong with the tests.