Fix filters tests

I fixed the MS filters test for your fix-suzy-container branch, cleaned up some whitespace in the tests, and merged in latest master.