Fix query interface mocking

Change-Id: I71ae75b113d4ff1b210bfbf3686ea62bb37340ec