working on tests
fixing mail bug