[#2201] Adding index entries and minor tweaks for new email testing entry