Issue #2352125 by eshta: Fix test setup change required by support for advagg module.