Fix smoke tests

Oleg Kachur requested to merge fix_smoke into master

Merge request reports