Rewrite callback model and adding an extra test for the email