Added to QueryStoreTest

Change-Id: I2527d2763a88caa0efac4fa88e9dbd15b1b55494
Merge "Added to QueryStoreTest"