Fix broken 2 99 build

This is an alternate fix to #1270.  It fixes the build and prevents other mock scope warnings.

I think I like it a bit better than the fix in #1270 but I'm curious on your thoughts, @xaviershay.