Refactor common code in search tests
Add tests for q vs fq handling across multiple queries

We expect all query calls to be combined into a single q parameter, but
we expect each filter call to produce a separate fq parameter