refactor
auth validator test
refactor
Merge branch 'master' into STB-135
Merge branch 'master' into STB-135
fix error handling
test auth validation
Merge branch 'master' into STB-135
test auth validation