WIP QueryRequest implemented plus some tests

Change-Id: Ib30e64e0bfd13a058bf98792a9a9eba43f693f43