Add test and fix up for setFilters and addFilter