Fixed a few broken tests from changing semantics in last commit
Added a regex test