Updated tests for FilterManager and others