Deflake a test w/ go1.3 random maps.

Can we stick to the term "selector" instead of "query"?