Simplify spec before calls to avoid tests breaking

- Don't use before :all due to cleanup issues
Use valid_email gem for email validation