Sans regex filter

I removed the regex filter functionality and added in the tests from the other pull-request