[MacPlatform] Change these back to pointers to hopefully fix test fail race.