COMP: Reverting to old tests.
Merge branch 'bug-18303-DeactivateTestsAgain'