Adding testing. Some Failing.

Some regex is in dire need of a change