WIP: Fix tests

Vadym Tishchenko requested to merge vadym/fix_tests into master

Merge request reports