Add tests for Query with Index
Use QueryQuery