Moved S/MIME piece out of testing
Modified CHUID text