Merge change 20885

* changes:
  fix and extend the filter test a bit