COMP: More debug output.
Merge branch 'bug-18303-DeactivateTestsAgain'