Fix include/exclude search unit test and misc.

This fixes the unit test for the include/exclude search, extends the test to check for activity targets and proper use of the and/or option, and does some housekeeping in the search itself.