fixing tests and email 'validation'