The explicit creation of a mock object in one test disturbed
the execution of another test (which mock'ed the same object).
Use a decorator instead.
Followup to Id20302537f7994982c7584af546a7e7520e9612b
Change-Id: Id54d0ade7084363cb3e53752205db9a9d99d0195