Use PHPUnit mocking support

Change-Id: Ie45f9b71bbb7b6ff9c3b21484c7be89f015696da
Removed ObservableQueryInterface

Change-Id: I977fc61eb4aa71619f592c43424e0b1ffef56fbd
Merge "Use PHPUnit mocking support"
Merge "Removed ObservableQueryInterface"