diff --git a/mms-lib/include/mms_log.h b/mms-lib/include/mms_log.h
index fcb112d..580e785 100644
--- a/mms-lib/include/mms_log.h
+++ b/mms-lib/include/mms_log.h
@@ -103,8 +103,12 @@ mms_logv(
     const char* format,
     va_list va);
 
+extern const char MMS_LOG_TYPE_STDOUT[];
+extern const char MMS_LOG_TYPE_GLIB[];
+extern const char MMS_LOG_TYPE_CUSTOM[];
 #ifdef unix
 #  define MMS_LOG_SYSLOG
+extern const char MMS_LOG_TYPE_SYSLOG[];
 #endif
 
 /* Available log handlers */
diff --git a/mms-lib/src/mms_log.c b/mms-lib/src/mms_log.c
index 425b7f4..8040564 100644
--- a/mms-lib/src/mms_log.c
+++ b/mms-lib/src/mms_log.c
@@ -50,11 +50,11 @@ static const struct _mms_log_level {
     { "verbose", "From verbose trace messages to errors" }
 };
 
-static const char MMS_LOG_TYPE_STDOUT[] = "stdout";
-static const char MMS_LOG_TYPE_GLIB[]   = "glib";
-static const char MMS_LOG_TYPE_CUSTOM[] = "custom";
+const char MMS_LOG_TYPE_STDOUT[] = "stdout";
+const char MMS_LOG_TYPE_GLIB[]   = "glib";
+const char MMS_LOG_TYPE_CUSTOM[] = "custom";
 #ifdef MMS_LOG_SYSLOG
-static const char MMS_LOG_TYPE_SYSLOG[] = "syslog";
+const char MMS_LOG_TYPE_SYSLOG[] = "syslog";
 #endif
 
 G_STATIC_ASSERT(G_N_ELEMENTS(mms_log_levels) > MMS_LOGLEVEL_MAX);
diff --git a/mms-lib/test/common/test_connman.c b/mms-lib/test/common/test_connman.c
index 2790b81..dae0703 100644
--- a/mms-lib/test/common/test_connman.c
+++ b/mms-lib/test/common/test_connman.c
@@ -27,6 +27,8 @@ typedef struct mms_connman_test {
     unsigned short port;
     gboolean proxy;
     char* default_imsi;
+    mms_connman_test_connect_fn connect_fn;
+    void* connect_param;
 } MMSConnManTest;
 
 G_DEFINE_TYPE(MMSConnManTest, mms_connman_test, MMS_TYPE_CONNMAN);
@@ -68,6 +70,17 @@ mms_connman_test_close_connection(
     }
 }
 
+void
+mms_connman_test_set_connect_callback(
+    MMSConnMan* cm,
+    mms_connman_test_connect_fn fn,
+    void* param)
+{
+    MMSConnManTest* test = MMS_CONNMAN_TEST(cm);
+    test->connect_fn = fn;
+    test->connect_param = param;
+}
+
 static
 char*
 mms_connman_test_default_imsi(
@@ -87,6 +100,7 @@ mms_connman_test_open_connection(
     mms_connman_test_close_connection(cm);
     if (test->port) {
         test->conn = mms_connection_test_new(imsi, test->port, test->proxy);
+        if (test->connect_fn) test->connect_fn(test->connect_param);
         return mms_connection_ref(test->conn);
     } else {
         return NULL;
diff --git a/mms-lib/test/common/test_connman.h b/mms-lib/test/common/test_connman.h
index b719fce..7792d3a 100644
--- a/mms-lib/test/common/test_connman.h
+++ b/mms-lib/test/common/test_connman.h
@@ -17,6 +17,11 @@
 
 #include "mms_connman.h"
 
+typedef
+void
+(*mms_connman_test_connect_fn)(
+    void* param);
+
 MMSConnMan*
 mms_connman_test_new(void);
 
@@ -31,6 +36,12 @@ mms_connman_test_set_default_imsi(
     MMSConnMan* cm,
     const char* imsi);
 
+void
+mms_connman_test_set_connect_callback(
+    MMSConnMan* cm,
+    mms_connman_test_connect_fn fn,
+    void* param);
+
 void
 mms_connman_test_close_connection(
     MMSConnMan* cm);
diff --git a/mms-lib/test/resize/test_resize.c b/mms-lib/test/resize/test_resize.c
index 485530f..f1593c7 100644
--- a/mms-lib/test/resize/test_resize.c
+++ b/mms-lib/test/resize/test_resize.c
@@ -395,6 +395,9 @@ test_run_one(
                 } else if (!ok && !test->size.width && !test->size.height) {
                     ret = RET_OK;
                 }
+                /* Extra ref/unref improves the coverage */
+                mms_attachment_ref(at);
+                mms_attachment_unref(at);
                 mms_attachment_unref(at);
             } else {
                 MMS_ERR("%s", MMS_ERRMSG(error));
diff --git a/mms-lib/test/send/data/Cancel/test.txt b/mms-lib/test/send/data/Cancel/test.txt
new file mode 100644
index 0000000..294742c
--- /dev/null
+++ b/mms-lib/test/send/data/Cancel/test.txt
@@ -0,0 +1 @@
+Send cancel test
diff --git a/mms-lib/test/send/data/EmptyMessageID/m-send.conf b/mms-lib/test/send/data/EmptyMessageID/m-send.conf
new file mode 100644
index 0000000..65d0225
Binary files /dev/null and b/mms-lib/test/send/data/EmptyMessageID/m-send.conf differ
diff --git a/mms-lib/test/send/data/EmptyMessageID/test.txt b/mms-lib/test/send/data/EmptyMessageID/test.txt
new file mode 100644
index 0000000..3686cf1
--- /dev/null
+++ b/mms-lib/test/send/data/EmptyMessageID/test.txt
@@ -0,0 +1 @@
+Test of empty message ID
diff --git a/mms-lib/test/send/data/TooBig/test.txt b/mms-lib/test/send/data/TooBig/test.txt
new file mode 100644
index 0000000..1da833f
--- /dev/null
+++ b/mms-lib/test/send/data/TooBig/test.txt
@@ -0,0 +1,2 @@
+This test sets a tiny size limit so that there's no way
+that PDU would possibly fit into that limit.
diff --git a/mms-lib/test/send/data/UnexpectedResp/m-send.conf b/mms-lib/test/send/data/UnexpectedResp/m-send.conf
new file mode 100644
index 0000000..1348b32
Binary files /dev/null and b/mms-lib/test/send/data/UnexpectedResp/m-send.conf differ
diff --git a/mms-lib/test/send/data/UnexpectedResp/test.txt b/mms-lib/test/send/data/UnexpectedResp/test.txt
new file mode 100644
index 0000000..660c3c7
--- /dev/null
+++ b/mms-lib/test/send/data/UnexpectedResp/test.txt
@@ -0,0 +1 @@
+Test of m-send.conf containing parsable PDU of unexpected type
diff --git a/mms-lib/test/send/data/UnparsableResp/m-send.conf b/mms-lib/test/send/data/UnparsableResp/m-send.conf
new file mode 100644
index 0000000..0e74333
--- /dev/null
+++ b/mms-lib/test/send/data/UnparsableResp/m-send.conf
@@ -0,0 +1 @@
+This is not a valid MMS PDU
diff --git a/mms-lib/test/send/data/UnparsableResp/test.txt b/mms-lib/test/send/data/UnparsableResp/test.txt
new file mode 100644
index 0000000..c0cb5c4
--- /dev/null
+++ b/mms-lib/test/send/data/UnparsableResp/test.txt
@@ -0,0 +1 @@
+Test of m-send.conf containing unparsable garbage
diff --git a/mms-lib/test/send/test_send.c b/mms-lib/test/send/test_send.c
index 4a9bbd5..2cc1312 100644
--- a/mms-lib/test/send/test_send.c
+++ b/mms-lib/test/send/test_send.c
@@ -36,6 +36,7 @@ typedef struct test_desc {
     const char* name;
     const MMSAttachmentInfo* parts;
     int nparts;
+    gsize size_limit;
     const char* subject;
     const char* to;
     const char* cc;
@@ -49,11 +50,16 @@ typedef struct test_desc {
     const char* msgid;
 } TestDesc;
 
+#define TEST_FLAG_CANCEL                  (0x1000)
 #define TEST_FLAG_REQUEST_DELIVERY_REPORT MMS_SEND_FLAG_REQUEST_DELIVERY_REPORT
 #define TEST_FLAG_REQUEST_READ_REPORT     MMS_SEND_FLAG_REQUEST_READ_REPORT
+
+/* ASSERT that test and dispatcher flags don't interfere with each other */ 
 #define TEST_DISPATCHER_FLAGS       (\
   TEST_FLAG_REQUEST_DELIVERY_REPORT |\
   TEST_FLAG_REQUEST_READ_REPORT     )
+#define TEST_PRIVATE_FLAGS                TEST_FLAG_CANCEL
+G_STATIC_ASSERT(!(TEST_PRIVATE_FLAGS & TEST_DISPATCHER_FLAGS));
 
 typedef struct test {
     const TestDesc* desc;
@@ -90,12 +96,17 @@ static const MMSAttachmentInfo test_files_reject [] = {
     { "test.txt", "text/plain", "text" }
 };
 
+static const MMSAttachmentInfo test_txt [] = {
+    { "test.txt", "text/plain", "text" }
+};
+
 #define ATTACHMENTS(a) a, G_N_ELEMENTS(a)
 
 static const TestDesc send_tests[] = {
     {
         "Accept",
         ATTACHMENTS(test_files_accept),
+        0,
         "Test of successful delivery",
         "+1234567890",
         "+2345678901,+3456789012",
@@ -110,6 +121,7 @@ static const TestDesc send_tests[] = {
     },{
         "AcceptNoExt",
         ATTACHMENTS(test_files_accept_no_ext),
+        0,
         "Test of successful delivery (no extensions)",
         "+1234567890",
         "+2345678901,+3456789012",
@@ -124,6 +136,7 @@ static const TestDesc send_tests[] = {
     },{
         "ServiceDenied",
         ATTACHMENTS(test_files_reject),
+        0,
         "Rejection test",
         "+1234567890",
         NULL,
@@ -138,6 +151,7 @@ static const TestDesc send_tests[] = {
     },{
         "Failure",
         ATTACHMENTS(test_files_reject),
+        0,
         "Failure test",
         "+1234567890",
         NULL,
@@ -149,6 +163,81 @@ static const TestDesc send_tests[] = {
         SOUP_STATUS_OK,
         MMS_SEND_STATE_SEND_ERROR,
         NULL
+    },{
+        "UnparsableResp",
+        ATTACHMENTS(test_txt),
+        0,
+        "Testing unparsable response",
+        "+1234567890",
+        NULL,
+        NULL,
+        NULL,
+        0,
+        "m-send.conf",
+        MMS_CONTENT_TYPE,
+        SOUP_STATUS_OK,
+        MMS_SEND_STATE_SEND_ERROR,
+        NULL
+    },{
+        "UnexpectedResp",
+        ATTACHMENTS(test_txt),
+        0,
+        "Testing unexpected response",
+        "+1234567890",
+        NULL,
+        NULL,
+        NULL,
+        0,
+        "m-send.conf",
+        MMS_CONTENT_TYPE,
+        SOUP_STATUS_OK,
+        MMS_SEND_STATE_SEND_ERROR,
+        NULL
+    },{
+        "EmptyMessageID",
+        ATTACHMENTS(test_txt),
+        0,
+        "Testing empty message id",
+        "+1234567890",
+        NULL,
+        NULL,
+        NULL,
+        0,
+        "m-send.conf",
+        MMS_CONTENT_TYPE,
+        SOUP_STATUS_OK,
+        MMS_SEND_STATE_SEND_ERROR,
+        NULL
+    },{
+        "Cancel",
+        ATTACHMENTS(test_txt),
+        0,
+        "Failure test",
+        "+1234567890",
+        NULL,
+        NULL,
+        NULL,
+        TEST_FLAG_CANCEL,
+        NULL,
+        NULL,
+        SOUP_STATUS_INTERNAL_SERVER_ERROR,
+        MMS_SEND_STATE_SEND_ERROR,
+        NULL
+    },{
+        "TooBig",
+        ATTACHMENTS(test_txt),
+        100,
+        "Size limit test",
+        "+1234567890",
+        NULL,
+        NULL,
+        NULL,
+        0,
+        NULL,
+        NULL,
+        SOUP_STATUS_INTERNAL_SERVER_ERROR,
+        MMS_SEND_STATE_TOO_BIG,
+        NULL
     }
 };
 
@@ -174,7 +263,7 @@ test_finish(
                 MMS_ERR("%s msgid %s, expected %s", name, msgid, desc->msgid);
             } else if (msgid && !desc->msgid) {
                 test->ret = RET_ERR;
-                MMS_ERR("%s msgidis not expected", name);
+                MMS_ERR("%s msgid is not expected", name);
             }
         }
     }
@@ -210,19 +299,36 @@ test_timeout(
     return FALSE;
 }
 
+static
+void
+test_cancel(
+    void* param)
+{
+    Test* test = param;
+    MMS_DEBUG("Cancelling %s", test->id);
+    mms_dispatcher_cancel(test->disp, test->id);
+}
+
 static
 gboolean
 test_init(
     Test* test,
-    const MMSConfig* config,
+    MMSConfig* config,
     const TestDesc* desc)
 {
     gboolean ok = FALSE;
-    GError* error = NULL;
-    char* fn = g_strconcat(DATA_DIR, desc->name, "/", desc->resp_file, NULL);
     memset(test, 0, sizeof(*test));
-    test->resp_file = g_mapped_file_new(fn, FALSE, &error);
-    if (test->resp_file) {
+    if (desc->resp_file) {
+        GError* error = NULL;
+        char* f = g_strconcat(DATA_DIR, desc->name, "/", desc->resp_file, NULL);
+        test->resp_file = g_mapped_file_new(f, FALSE, &error);
+        if (!test->resp_file) {
+            MMS_ERR("%s", MMS_ERRMSG(error));
+            g_error_free(error);
+        }
+        g_free(f);
+    }
+    if (!desc->resp_file || test->resp_file) {
         int i;
         guint port;
         test->parts = g_new0(MMSAttachmentInfo, desc->nparts);
@@ -245,13 +351,13 @@ test_init(
             desc->resp_status);
         port = test_http_get_port(test->http);
         mms_connman_test_set_port(test->cm, port, TRUE);
+        if (desc->flags & TEST_FLAG_CANCEL) {
+            mms_connman_test_set_connect_callback(test->cm, test_cancel, test);
+        }
+        if (desc->size_limit) config->size_limit = desc->size_limit;
         test->ret = RET_ERR;
         ok = TRUE;
-    } else {
-        MMS_ERR("%s", MMS_ERRMSG(error));
-        g_error_free(error);
     }
-    g_free(fn);
     return ok;
 }
 
@@ -274,7 +380,7 @@ test_finalize(
     mms_handler_unref(test->handler);
     mms_dispatcher_unref(test->disp);
     g_main_loop_unref(test->loop);
-    g_mapped_file_unref(test->resp_file);
+    if (test->resp_file) g_mapped_file_unref(test->resp_file);
     for (i=0; i<test->desc->nparts; i++) g_free(test->files[i]);
     g_free(test->files);
     g_free(test->parts);
@@ -289,7 +395,8 @@ test_run_once(
     gboolean debug)
 {
     Test test;
-    if (test_init(&test, config, desc)) {
+    MMSConfig test_config = *config;
+    if (test_init(&test, &test_config, desc)) {
         GError* error = NULL;
         char* imsi = desc->imsi ? g_strdup(desc->imsi) :
             mms_connman_default_imsi(test.cm);
@@ -380,7 +487,7 @@ int main(int argc, char* argv[])
         config.root_dir = tmpd;
         config.idle_secs = 0;
 
-        mms_log_default.name = "test_send";
+        mms_log_set_type(MMS_LOG_TYPE_STDOUT, "test_send");
         if (verbose) {
             mms_log_default.level = MMS_LOGLEVEL_VERBOSE;
         } else {