Moved default email templates directly to code base, fixed failing tests, fixed broken email validation