Updated tests
Merge branch 'feature/graph' into develop