Adding Query Management API calls & tests
Close #33