refactor
refactor
fix error handling
Merge branch 'master' into STB-134
/services validation with tests