Some updates to QS prototype based on new mocks

Change-Id: Ic9c0cfcb77f558fa82edb4dc39406ce95b031b35
9 files changed