Draft: Resolve "Hooks in system tests"

Slawek Figiel requested to merge 1181-hooks-in-system-tests into master

Closes #1181

Merge request reports