Fixes and refactoring in the graph tests
Merge pull request #1 from dlogothetis/master

Fixes and refactoring in the graph tests