Fixing bug in Interrogator tests mocks.

Change-Id: I474c4469842bd5e68632d49a2b4711beeae06128
Merge "Fixing bug in Interrogator tests mocks."