Query: moved test filter classes into own package.
Query: Added rank constraints to existing filters.
Query: Added rank constraints to command line client filters.