Updated test configuration.
Refactoring methods names.
Merge branch 'feature/graphs' into develop