Remove \W in favour of individual special chars as tests were failing.