Unit test fix

Merged Piotr Gawron requested to merge unit-test-fix into master

Merge request reports