Better Regex to escape special characters + Updated tests