Simplifies regex and adds intention revealing test