Moved S/MIME piece out of testing