Finishing email setup and integration tests