improved MockAsWar tracking