additional checks in code
Merge branch 'master' into with_tests
mocking tests