Change zcml structure to fix testing import affinitic refs #5749