DRY regex, more tests