Fix/current broken tests

Oleg Kachur requested to merge fix/current_broken_tests into master

Merge request reports