Fix specs
Add email specs