This implements the cleanup of the MGC tests following the interface changes over here:
atlas/athena!30557 (merged)