Add email validation and db index
remove test directory