Use internd string as key
Fix tests I broke with the E_ERROR > E_RECOVERABLE_ERROR change