Issue #3395977 by fjgarlin, smustgrave, mstrelan, mondrake: Test-only changes reverts changes to test modules (cherry picked from commit 127eccde)