Merge "Add performance tests for query / get"