Fix typo in test name
Add Index and Query support