diff --git a/src/detect-engine-port.c b/src/detect-engine-port.c
index c333547f9e..f27359d21a 100644
--- a/src/detect-engine-port.c
+++ b/src/detect-engine-port.c
@@ -1435,51 +1435,6 @@ void DetectPortHashFree(DetectEngineCtx *de_ctx)
 #ifdef UNITTESTS
 #include "packet.h"
 
-/**
- * \brief Do a sorted insert, where the top of the list should be the biggest
- * port range.
- *
- * \todo XXX current sorting only works for overlapping ranges
- *
- * \param head Pointer to the DetectPort list head
- * \param dp Pointer to DetectPort to search in the DetectPort list
- * \retval 0 if dp is added correctly
- */
-static int PortTestDetectPortAdd(DetectPort **head, DetectPort *dp)
-{
-    DetectPort *cur, *prev_cur = NULL;
-
-    //SCLogDebug("DetectPortAdd: adding "); DetectPortPrint(ag); SCLogDebug("");
-
-    if (*head != NULL) {
-        for (cur = *head; cur != NULL; cur = cur->next) {
-            prev_cur = cur;
-            int r = DetectPortCmp(dp,cur);
-            if (r == PORT_EB) {
-                /* insert here */
-                dp->prev = cur->prev;
-                dp->next = cur;
-
-                cur->prev = dp;
-                if (*head == cur) {
-                    *head = dp;
-                } else {
-                    dp->prev->next = dp;
-                }
-                return 0;
-            }
-        }
-        dp->prev = prev_cur;
-        if (prev_cur != NULL)
-            prev_cur->next = dp;
-    } else {
-        *head = dp;
-    }
-
-    return 0;
-}
-
-
 /**
  * \test Check if a DetectPort is properly allocated
  */
@@ -1711,68 +1666,6 @@ static int PortTestParse16 (void)
     PASS;
 }
 
-/**
- * \test Test general functions
- */
-static int PortTestFunctions01(void)
-{
-    DetectPort *head = NULL;
-    DetectPort *dp1= NULL;
-    int result = 0;
-
-    /* Parse */
-    int r = DetectPortParse(NULL,&head,"![0:100,1000:65535]");
-    if (r != 0 || head->next != NULL)
-        goto end;
-
-    /* We should have only one DetectPort */
-    if (!(head->port == 101))
-        goto end;
-    if (!(head->port2 == 999))
-        goto end;
-    if (!(head->next == NULL))
-        goto end;
-
-    r = DetectPortParse(NULL, &dp1,"2000:3000");
-    if (r != 0 || dp1->next != NULL)
-        goto end;
-    if (!(dp1->port == 2000))
-        goto end;
-    if (!(dp1->port2 == 3000))
-        goto end;
-
-    /* Add */
-    r = PortTestDetectPortAdd(&head, dp1);
-    if (r != 0 || head->next == NULL)
-        goto end;
-    if (!(head->port == 101))
-        goto end;
-    if (!(head->port2 == 999))
-        goto end;
-    if (!(head->next->port == 2000))
-        goto end;
-    if (!(head->next->port2 == 3000))
-        goto end;
-
-    /* Match */
-    if (!DetectPortMatch(head, 150))
-        goto end;
-    if (DetectPortMatch(head->next, 1500))
-        goto end;
-    if ((DetectPortMatch(head, 3500)))
-        goto end;
-    if ((DetectPortMatch(head, 50)))
-        goto end;
-
-    result = 1;
-end:
-    if (dp1 != NULL)
-        DetectPortFree(NULL, dp1);
-    if (head != NULL)
-        DetectPortFree(NULL, head);
-    return result;
-}
-
 /**
  * \test Test general functions
  */
@@ -1815,11 +1708,11 @@ static int PortTestFunctions02(void)
 
 end:
     if (dp1 != NULL)
-        DetectPortFree(NULL, dp1);
+        DetectPortCleanupList(NULL, dp1);
     if (dp2 != NULL)
-        DetectPortFree(NULL, dp2);
+        DetectPortCleanupList(NULL, dp2);
     if (head != NULL)
-        DetectPortFree(NULL, head);
+        DetectPortCleanupList(NULL, head);
     return result;
 }
 
@@ -1881,11 +1774,11 @@ static int PortTestFunctions03(void)
 
 end:
     if (dp1 != NULL)
-        DetectPortFree(NULL, dp1);
+        DetectPortCleanupList(NULL, dp1);
     if (dp2 != NULL)
-        DetectPortFree(NULL, dp2);
+        DetectPortCleanupList(NULL, dp2);
     if (dp3 != NULL)
-        DetectPortFree(NULL, dp3);
+        DetectPortCleanupList(NULL, dp3);
     return result;
 }
 
@@ -1894,18 +1787,16 @@ end:
  */
 static int PortTestFunctions04(void)
 {
-    DetectPort *dp1= NULL;
-    DetectPort *dp2= NULL;
+    DetectPort *dp1 = NULL;
+    DetectPort *dp2 = NULL;
     int result = 0;
 
     int r = DetectPortParse(NULL, &dp1, "200:300");
     if (r != 0)
         goto end;
 
-    dp2 = DetectPortInit();
-
     /* Cut Not */
-    DetectPortCutNot(dp1, &dp2);
+    r = DetectPortCutNot(dp1, &dp2);
     if (r != 0)
         goto end;
 
@@ -1921,9 +1812,9 @@ static int PortTestFunctions04(void)
     result = 1;
 end:
     if (dp1 != NULL)
-        DetectPortFree(NULL, dp1);
+        DetectPortCleanupList(NULL, dp1);
     if (dp2 != NULL)
-        DetectPortFree(NULL, dp2);
+        DetectPortCleanupList(NULL, dp2);
     return result;
 }
 
@@ -1971,7 +1862,7 @@ static int PortTestMatchReal(uint8_t *raw_eth_pkt, uint16_t pktsize, const char
     FlowInitConfig(FLOW_QUIET);
     Packet *p = UTHBuildPacketFromEth(raw_eth_pkt, pktsize);
     result = UTHPacketMatchSig(p, sig);
-    PacketRecycle(p);
+    PacketFree(p);
     FlowShutdown();
     return result;
 }
@@ -2239,16 +2130,12 @@ static int PortTestMatchReal19(void)
 
 static int PortTestMatchDoubleNegation(void)
 {
-    int result = 0;
     DetectPort *head = NULL, *nhead = NULL;
-
-    if (DetectPortParseDo(NULL, &head, &nhead, "![!80]", 0, NULL, 0) == -1)
-        return result;
-
-    result = (head != NULL);
-    result = (nhead == NULL);
-
-    return result;
+    FAIL_IF(DetectPortParseDo(NULL, &head, &nhead, "![!80]", 0, NULL, 0) == -1);
+    FAIL_IF_NOT(head != NULL);
+    FAIL_IF_NOT(nhead == NULL);
+    DetectPortCleanupList(NULL, head);
+    PASS;
 }
 
 // Test that negation is successfully parsed with whitespace for port strings of
@@ -2272,6 +2159,7 @@ static int DetectPortParseDoTest(void)
     FAIL_IF(nhead->port2 != 45);
     DetectPortCleanupList(NULL, head);
     DetectPortCleanupList(NULL, nhead);
+    DetectEngineCtxFree(de_ctx);
     PASS;
 }
 
@@ -2286,6 +2174,7 @@ static int DetectPortParseDoTest2(void)
     FAIL_IF(r < 0);
     DetectPortCleanupList(NULL, head);
     DetectPortCleanupList(NULL, nhead);
+    DetectEngineCtxFree(de_ctx);
     PASS;
 }
 
@@ -2342,7 +2231,6 @@ void DetectPortTests(void)
     UtRegisterTest("PortTestParse14", PortTestParse14);
     UtRegisterTest("PortTestParse15", PortTestParse15);
     UtRegisterTest("PortTestParse16", PortTestParse16);
-    UtRegisterTest("PortTestFunctions01", PortTestFunctions01);
     UtRegisterTest("PortTestFunctions02", PortTestFunctions02);
     UtRegisterTest("PortTestFunctions03", PortTestFunctions03);
     UtRegisterTest("PortTestFunctions04", PortTestFunctions04);
diff --git a/src/util-unittest-helper.c b/src/util-unittest-helper.c
index 93549e4898..2a7abce97d 100644
--- a/src/util-unittest-helper.c
+++ b/src/util-unittest-helper.c
@@ -793,8 +793,8 @@ int UTHPacketMatchSigMpm(Packet *p, char *sig, uint16_t mpm_type)
     }
     de_ctx->flags |= DE_QUIET;
 
-    de_ctx->sig_list = SigInit(de_ctx, sig);
-    if (de_ctx->sig_list == NULL) {
+    Signature *s = DetectEngineAppendSig(de_ctx, sig);
+    if (s == NULL) {
         printf("signature == NULL: ");
         goto end;
     }
@@ -803,7 +803,7 @@ int UTHPacketMatchSigMpm(Packet *p, char *sig, uint16_t mpm_type)
     DetectEngineThreadCtxInit(&th_v, (void *)de_ctx, (void *)&det_ctx);
 
     SigMatchSignatures(&th_v, de_ctx, det_ctx, p);
-    if (PacketAlertCheck(p, de_ctx->sig_list->id) != 1) {
+    if (PacketAlertCheck(p, s->id) != 1) {
         printf("signature didn't alert: ");
         goto end;
     }
@@ -832,7 +832,6 @@ int UTHPacketMatchSig(Packet *p, const char *sig)
     int result = 1;
 
     DecodeThreadVars dtv;
-
     ThreadVars th_v;
     DetectEngineThreadCtx *det_ctx = NULL;
 
@@ -847,8 +846,8 @@ int UTHPacketMatchSig(Packet *p, const char *sig)
 
     de_ctx->flags |= DE_QUIET;
 
-    de_ctx->sig_list = SigInit(de_ctx, sig);
-    if (de_ctx->sig_list == NULL) {
+    Signature *s = DetectEngineAppendSig(de_ctx, sig);
+    if (s == NULL) {
         result = 0;
         goto end;
     }
@@ -857,22 +856,17 @@ int UTHPacketMatchSig(Packet *p, const char *sig)
     DetectEngineThreadCtxInit(&th_v, (void *)de_ctx, (void *)&det_ctx);
 
     SigMatchSignatures(&th_v, de_ctx, det_ctx, p);
-    if (PacketAlertCheck(p, de_ctx->sig_list->id) != 1) {
+    if (PacketAlertCheck(p, s->id) != 1) {
         result = 0;
         goto end;
     }
 
 end:
-    if (de_ctx) {
-	SigGroupCleanup(de_ctx);
-	SigCleanSignatures(de_ctx);
-    }
-
     if (det_ctx != NULL)
         DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx);
     if (de_ctx != NULL)
         DetectEngineCtxFree(de_ctx);
-
+    StatsThreadCleanup(&th_v);
     return result;
 }