Added spectests and comments for graph controller and refactored a bit
Cleanup after refactoring
Merge branch 'feature/graph/refactor' into develop