Revert "Fix conflicts in testreport module"

This reverts commit 45b42a46510c800a33168e2415b29fbd419feb1c.