Improve Filter testing