System test framework: cleanup tweaks

Merged Michał Kępień requested to merge 1452-system-test-framework-cleanup-tweaks into master

Merge request reports