Test improvements from review

 * Not unneeded namespacing
 * Better description for Query.entries
 * Merged test for combined arguments