Minor test improvement. Updates #28.
Updated simple mail demo. Updates #12.
Updated mail-calendar-contact demo. Fixes #13. Updates #12.