Unit test refactor

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

Merge request reports