Revised filtering tests as per @InvokeJLa code review.  Now testing everything thoroughly.
Revised filtering tests as per @InvokeJLa code review.  Now testing everything thoroughly.

Invoca/backdraft,Invoca/backdraft