Andrey/test fixes

Andrey Veltischev requested to merge andrey/test_fixes into master

Merge request reports