Updating tests and filtering logic with better regex

Updating tests and filtering logic with better regex #919