Resolve "refactor test framework"

Merged Piotr Gawron requested to merge 1016-refactor-test-framework into master
Edited by Piotr Gawron

Merge request reports