For ENG-6644, fix broken full memcheck tests