begin work on the FilteringTest
Merge remote-tracking branch 'origin/master'