[ANALYZER-2197] Fixes a couple new failures die to missing mocks.
Merge pull request #1099 from lucboudreau/master

[ANALYZER-2197] Fixes a couple new failures die to missing mocks.