Feature/update query tests

Opening this pull request for visibility and discussion; not yet ready to merge.