Added tests for ServiceManagers
Refactorings
Merge branch 'feature/sonarIssues' into develop