Improve doc test coverage
Reduce spec parser regular expression searches