Fix MemTest* after sloppy rebase.