rename login to email and some tests