(#2347) Typo, "when encountering"

Following comments in pull request #1924
(#2437) Renaming the spec test case constants

The constants in the spec now have a name that tries to
indicate what is tested. Previous naming was not
explicit.