Prevent duplicate emails and remove duplicate test