Add certificate function
Fix bug in TEH_INC_SUFFIX