Also unittest module (gently) remove refs T197