Updated FilterTests to test changed logic.

Also removed constraints test as we don't do these anymore.