QueryData add test

Test coverage: 100%
CRAP: 7

Change-Id: I5cb21ff3fe799cfade559105d302188db6b1372e