add Mail.php - required by mass email
fix container problem. hopefully tests run now