BRID-91:  Refactoring of tests & services
Merge branch 'master' of https://github.com/Singleton-Theory/SingletonTheory.Services.git