Convert SimpleTest into FilteredQuery.

In a later step I want to move the 'compound' query into the query code
rather than the test code to allow nested compound queries. But first
SimpleTest must go away.