Changed default email template dir from -email- to -emails-
Moved test templates to -emails-