Fixed #23289 -- Added mock as a test dependency.

Is it worth setting an alias somewhere or are we going to dance try/except in every file using mock?