fix up some of the other tests affected by the changes to check filtering