Small fix
Merge branch 'develop' into stanislav.skrebtsov
Fixed bugs in tests