Fix unit tests

Andrey Veltischev requested to merge andre/fix_unit into master

Merge request reports