Added tests from other pull request
Merge branch 'refs/heads/sans-regex-filter'