Fixing some email issues
Commenting out broken code
Fixing some breaking tests