Improve spec coverage.
Ditto.
Ditto.
DRY with a Regexp.