Fixing regex, adding more tests.