detect: fix file_data / http_server_body tests

diff --git a/src/detect-fast-pattern.c b/src/detect-fast-pattern.c
index c4cb73dd0bc2449057e8dcbe7e876e2727ac9588..8370d08af030cfae93551a8084c24bec775a520d 100644 (file)
--- a/src/detect-fast-pattern.c
+++ b/src/detect-fast-pattern.c
@@ -371,7 +371,7 @@ int DetectFastPatternTest01(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"/one/\"; tcpv4-csum:valid; fast_pattern; "
                                "msg:\"Testing fast_pattern\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
@@ -411,7 +411,7 @@ int DetectFastPatternTest02(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"/one/\"; fast_pattern; "
                                "content:\"boo\"; fast_pattern; "
                                "msg:\"Testing fast_pattern\"; sid:1;)");
@@ -440,7 +440,7 @@ int DetectFastPatternTest03(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"/one/\"; "
                                "msg:\"Testing fast_pattern\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
@@ -480,7 +480,7 @@ int DetectFastPatternTest04(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"/one/\"; fast_pattern:boo; "
                                "msg:\"Testing fast_pattern\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
@@ -569,7 +569,7 @@ int DetectFastPatternTest15(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"/one/\"; fast_pattern:only; "
                                "msg:\"Testing fast_pattern\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
@@ -610,7 +610,7 @@ int DetectFastPatternTest16(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"oneoneone\"; fast_pattern:3,4; "
                                "msg:\"Testing fast_pattern\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
@@ -648,7 +648,7 @@ int DetectFastPatternTest17(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; fast_pattern:only; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -684,7 +684,7 @@ int DetectFastPatternTest18(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"oneoneone\"; fast_pattern:3,4; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -719,7 +719,7 @@ int DetectFastPatternTest19(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; content:\"two\"; fast_pattern:only; distance:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -741,7 +741,7 @@ int DetectFastPatternTest20(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; content:\"two\"; distance:10; fast_pattern:only; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -763,7 +763,7 @@ int DetectFastPatternTest21(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; content:\"two\"; fast_pattern:only; within:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -785,7 +785,7 @@ int DetectFastPatternTest22(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; content:\"two\"; within:10; fast_pattern:only; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -807,7 +807,7 @@ int DetectFastPatternTest23(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; content:\"two\"; fast_pattern:only; offset:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -829,7 +829,7 @@ int DetectFastPatternTest24(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; content:\"two\"; offset:10; fast_pattern:only; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -851,7 +851,7 @@ int DetectFastPatternTest25(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; content:\"two\"; fast_pattern:only; depth:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -873,7 +873,7 @@ int DetectFastPatternTest26(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; content:\"two\"; depth:10; fast_pattern:only; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -895,7 +895,7 @@ int DetectFastPatternTest27(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; content:!\"two\"; fast_pattern:only; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -917,7 +917,7 @@ int DetectFastPatternTest28(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content: \"one\"; content:\"two\"; distance:30; content:\"two\"; fast_pattern:only; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -948,7 +948,7 @@ int DetectFastPatternTest29(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; content:\"two\"; within:30; content:\"two\"; fast_pattern:only; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -978,7 +978,7 @@ int DetectFastPatternTest30(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; content:\"two\"; offset:30; content:\"two\"; fast_pattern:only; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -1008,7 +1008,7 @@ int DetectFastPatternTest31(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; content:\"two\"; depth:30; content:\"two\"; fast_pattern:only; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -1038,7 +1038,7 @@ int DetectFastPatternTest32(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:!\"one\"; fast_pattern; content:\"two\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -1069,7 +1069,7 @@ int DetectFastPatternTest33(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; content:!\"one\"; fast_pattern; distance:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -1091,7 +1091,7 @@ int DetectFastPatternTest34(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; content:!\"one\"; fast_pattern; within:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -1113,7 +1113,7 @@ int DetectFastPatternTest35(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; content:!\"one\"; fast_pattern; offset:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -1135,7 +1135,7 @@ int DetectFastPatternTest36(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; content:!\"one\"; fast_pattern; depth:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -1157,7 +1157,7 @@ int DetectFastPatternTest37(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"oneoneone\"; content:\"oneonetwo\"; fast_pattern:3,4; content:\"three\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -1187,7 +1187,7 @@ int DetectFastPatternTest38(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; content:\"twotwotwo\"; fast_pattern:3,4; content:\"three\"; distance:30; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -1217,7 +1217,7 @@ int DetectFastPatternTest39(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; content:\"twotwotwo\"; fast_pattern:3,4; content:\"three\"; within:30; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -1247,7 +1247,7 @@ int DetectFastPatternTest40(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; content:\"twotwotwo\"; fast_pattern:3,4; content:\"three\"; offset:30; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -1277,7 +1277,7 @@ int DetectFastPatternTest41(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; content:\"twotwotwo\"; fast_pattern:3,4; content:\"three\"; depth:30; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -1307,7 +1307,7 @@ int DetectFastPatternTest42(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; content:\"two\"; distance:10; content:\"threethree\"; fast_pattern:3,4; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -1337,7 +1337,7 @@ int DetectFastPatternTest43(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; content:\"two\"; within:10; content:\"threethree\"; fast_pattern:3,4; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -1367,7 +1367,7 @@ int DetectFastPatternTest44(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; content:\"two\"; offset:10; content:\"threethree\"; fast_pattern:3,4; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -1397,7 +1397,7 @@ int DetectFastPatternTest45(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; content:\"two\"; depth:10; content:\"threethree\"; fast_pattern:3,4; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -1427,7 +1427,7 @@ int DetectFastPatternTest46(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; content:\"two\"; fast_pattern:65977,4; content:\"three\"; distance:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -1449,7 +1449,7 @@ int DetectFastPatternTest47(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; content:\"twooneone\"; fast_pattern:3,65977; content:\"three\"; distance:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -1471,7 +1471,7 @@ int DetectFastPatternTest48(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; content:\"two\"; fast_pattern:65534,4; content:\"three\"; distance:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -1493,7 +1493,7 @@ int DetectFastPatternTest49(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; content:!\"twooneone\"; fast_pattern:3,4; content:\"three\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -1524,7 +1524,7 @@ int DetectFastPatternTest50(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; content:!\"twooneone\"; fast_pattern:3,4; distance:10; content:\"three\"; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -1546,7 +1546,7 @@ int DetectFastPatternTest51(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; content:!\"twooneone\"; fast_pattern:3,4; within:10; content:\"three\"; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -1568,7 +1568,7 @@ int DetectFastPatternTest52(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; content:!\"twooneone\"; fast_pattern:3,4; offset:10; content:\"three\"; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -1590,7 +1590,7 @@ int DetectFastPatternTest53(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; content:!\"twooneone\"; fast_pattern:3,4; depth:10; content:\"three\"; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -1621,7 +1621,7 @@ int DetectFastPatternTest54(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"/one/\"; fast_pattern:only; "
                                "msg:\"Testing fast_pattern\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
@@ -1662,7 +1662,7 @@ int DetectFastPatternTest55(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"oneoneone\"; fast_pattern:3,4; "
                                "msg:\"Testing fast_pattern\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
@@ -1700,7 +1700,7 @@ int DetectFastPatternTest56(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; fast_pattern:only; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -1736,7 +1736,7 @@ int DetectFastPatternTest57(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"oneoneone\"; fast_pattern:3,4; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -1771,7 +1771,7 @@ int DetectFastPatternTest58(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; uricontent:\"two\"; fast_pattern:only; distance:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -1793,7 +1793,7 @@ int DetectFastPatternTest59(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; uricontent:\"two\"; distance:10; fast_pattern:only; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -1815,7 +1815,7 @@ int DetectFastPatternTest60(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; uricontent:\"two\"; fast_pattern:only; within:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -1837,7 +1837,7 @@ int DetectFastPatternTest61(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; uricontent:\"two\"; within:10; fast_pattern:only; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -1859,7 +1859,7 @@ int DetectFastPatternTest62(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; uricontent:\"two\"; fast_pattern:only; offset:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -1881,7 +1881,7 @@ int DetectFastPatternTest63(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; uricontent:\"two\"; offset:10; fast_pattern:only; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -1903,7 +1903,7 @@ int DetectFastPatternTest64(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; uricontent:\"two\"; fast_pattern:only; depth:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -1925,7 +1925,7 @@ int DetectFastPatternTest65(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; uricontent:\"two\"; depth:10; fast_pattern:only; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -1947,7 +1947,7 @@ int DetectFastPatternTest66(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; uricontent:!\"two\"; fast_pattern:only; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -1969,7 +1969,7 @@ int DetectFastPatternTest67(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent: \"one\"; uricontent:\"two\"; distance:30; uricontent:\"two\"; fast_pattern:only; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -2000,7 +2000,7 @@ int DetectFastPatternTest68(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; uricontent:\"two\"; within:30; uricontent:\"two\"; fast_pattern:only; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -2030,7 +2030,7 @@ int DetectFastPatternTest69(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; uricontent:\"two\"; offset:30; uricontent:\"two\"; fast_pattern:only; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -2060,7 +2060,7 @@ int DetectFastPatternTest70(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; uricontent:\"two\"; depth:30; uricontent:\"two\"; fast_pattern:only; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -2090,7 +2090,7 @@ int DetectFastPatternTest71(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:!\"one\"; fast_pattern; uricontent:\"two\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -2121,7 +2121,7 @@ int DetectFastPatternTest72(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"two\"; uricontent:!\"one\"; fast_pattern; distance:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -2143,7 +2143,7 @@ int DetectFastPatternTest73(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"two\"; uricontent:!\"one\"; fast_pattern; within:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -2165,7 +2165,7 @@ int DetectFastPatternTest74(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"two\"; uricontent:!\"one\"; fast_pattern; offset:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -2187,7 +2187,7 @@ int DetectFastPatternTest75(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"two\"; uricontent:!\"one\"; fast_pattern; depth:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -2209,7 +2209,7 @@ int DetectFastPatternTest76(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; uricontent:\"oneonetwo\"; fast_pattern:3,4; uricontent:\"three\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -2239,7 +2239,7 @@ int DetectFastPatternTest77(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; uricontent:\"oneonetwo\"; fast_pattern:3,4; uricontent:\"three\"; distance:30; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -2269,7 +2269,7 @@ int DetectFastPatternTest78(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; uricontent:\"oneonetwo\"; fast_pattern:3,4; uricontent:\"three\"; within:30; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -2299,7 +2299,7 @@ int DetectFastPatternTest79(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; uricontent:\"oneonetwo\"; fast_pattern:3,4; uricontent:\"three\"; offset:30; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -2329,7 +2329,7 @@ int DetectFastPatternTest80(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; uricontent:\"oneonetwo\"; fast_pattern:3,4; uricontent:\"three\"; depth:30; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -2359,7 +2359,7 @@ int DetectFastPatternTest81(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; uricontent:\"two\"; distance:10; uricontent:\"oneonethree\"; fast_pattern:3,4; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -2389,7 +2389,7 @@ int DetectFastPatternTest82(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; uricontent:\"two\"; within:10; uricontent:\"oneonethree\"; fast_pattern:3,4; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -2419,7 +2419,7 @@ int DetectFastPatternTest83(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; uricontent:\"two\"; offset:10; uricontent:\"oneonethree\"; fast_pattern:3,4; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -2449,7 +2449,7 @@ int DetectFastPatternTest84(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; uricontent:\"two\"; depth:10; uricontent:\"oneonethree\"; fast_pattern:3,4; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -2482,7 +2482,7 @@ int DetectFastPatternTest85(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; uricontent:\"two\"; fast_pattern:65977,4; uricontent:\"three\"; distance:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -2504,7 +2504,7 @@ int DetectFastPatternTest86(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; uricontent:\"oneonetwo\"; fast_pattern:3,65977; uricontent:\"three\"; distance:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -2526,7 +2526,7 @@ int DetectFastPatternTest87(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; uricontent:\"two\"; fast_pattern:65534,4; uricontent:\"three\"; distance:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -2548,7 +2548,7 @@ int DetectFastPatternTest88(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; uricontent:!\"oneonetwo\"; fast_pattern:3,4; uricontent:\"three\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -2579,7 +2579,7 @@ int DetectFastPatternTest89(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; uricontent:!\"oneonetwo\"; fast_pattern:3,4; distance:10; uricontent:\"three\"; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -2601,7 +2601,7 @@ int DetectFastPatternTest90(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; uricontent:!\"oneonetwo\"; fast_pattern:3,4; within:10; uricontent:\"three\"; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -2623,7 +2623,7 @@ int DetectFastPatternTest91(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; uricontent:!\"oneonetwo\"; fast_pattern:3,4; offset:10; uricontent:\"three\"; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -2645,7 +2645,7 @@ int DetectFastPatternTest92(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; uricontent:!\"oneonetwo\"; fast_pattern:3,4; depth:10; uricontent:\"three\"; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -2672,7 +2672,7 @@ int DetectFastPatternTest93(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; content:!\"oneonetwo\"; fast_pattern:3,4; http_uri; uricontent:\"three\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -2707,7 +2707,7 @@ int DetectFastPatternTest94(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"/one/\"; fast_pattern:only; http_uri; "
                                "msg:\"Testing fast_pattern\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
@@ -2748,7 +2748,7 @@ int DetectFastPatternTest95(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"oneoneone\"; fast_pattern:3,4; http_uri; "
                                "msg:\"Testing fast_pattern\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
@@ -2786,7 +2786,7 @@ int DetectFastPatternTest96(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; fast_pattern:only; http_uri; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -2822,7 +2822,7 @@ int DetectFastPatternTest97(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"oneoneone\"; fast_pattern:3,4; http_uri; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -2857,7 +2857,7 @@ int DetectFastPatternTest98(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; content:\"two\"; fast_pattern:only; http_uri; distance:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -2879,7 +2879,7 @@ int DetectFastPatternTest99(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; content:\"two\"; distance:10; fast_pattern:only; http_uri; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -2901,7 +2901,7 @@ int DetectFastPatternTest100(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; content:\"two\"; fast_pattern:only; http_uri; within:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -2923,7 +2923,7 @@ int DetectFastPatternTest101(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; content:\"two\"; within:10; fast_pattern:only; http_uri; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -2945,7 +2945,7 @@ int DetectFastPatternTest102(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; content:\"two\"; fast_pattern:only; http_uri; offset:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -2967,7 +2967,7 @@ int DetectFastPatternTest103(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; content:\"two\"; offset:10; fast_pattern:only; http_uri; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -2989,7 +2989,7 @@ int DetectFastPatternTest104(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; content:\"two\"; fast_pattern:only; http_uri; depth:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -3011,7 +3011,7 @@ int DetectFastPatternTest105(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; content:\"two\"; depth:10; fast_pattern:only; http_uri; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -3033,7 +3033,7 @@ int DetectFastPatternTest106(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; content:!\"two\"; fast_pattern:only; http_uri; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -3055,7 +3055,7 @@ int DetectFastPatternTest107(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent: \"one\"; uricontent:\"two\"; distance:30; content:\"two\"; fast_pattern:only; http_uri; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -3086,7 +3086,7 @@ int DetectFastPatternTest108(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; uricontent:\"two\"; within:30; content:\"two\"; fast_pattern:only; http_uri; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -3116,7 +3116,7 @@ int DetectFastPatternTest109(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; uricontent:\"two\"; offset:30; content:\"two\"; fast_pattern:only; http_uri; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -3146,7 +3146,7 @@ int DetectFastPatternTest110(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; uricontent:\"two\"; depth:30; content:\"two\"; fast_pattern:only; http_uri; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -3176,7 +3176,7 @@ int DetectFastPatternTest111(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:!\"one\"; fast_pattern; http_uri; uricontent:\"two\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -3207,7 +3207,7 @@ int DetectFastPatternTest112(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"two\"; content:!\"one\"; fast_pattern; http_uri; distance:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -3229,7 +3229,7 @@ int DetectFastPatternTest113(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"two\"; content:!\"one\"; fast_pattern; http_uri; within:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -3251,7 +3251,7 @@ int DetectFastPatternTest114(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"two\"; content:!\"one\"; fast_pattern; http_uri; offset:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -3273,7 +3273,7 @@ int DetectFastPatternTest115(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"two\"; content:!\"one\"; fast_pattern; http_uri; depth:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -3295,7 +3295,7 @@ int DetectFastPatternTest116(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; content:\"oneonetwo\"; fast_pattern:3,4; http_uri; uricontent:\"three\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -3325,7 +3325,7 @@ int DetectFastPatternTest117(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; content:\"oneonetwo\"; fast_pattern:3,4; http_uri; uricontent:\"three\"; distance:30; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -3355,7 +3355,7 @@ int DetectFastPatternTest118(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; content:\"oneonetwo\"; fast_pattern:3,4; http_uri; uricontent:\"three\"; within:30; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -3385,7 +3385,7 @@ int DetectFastPatternTest119(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; content:\"oneonetwo\"; fast_pattern:3,4; http_uri; uricontent:\"three\"; offset:30; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -3415,7 +3415,7 @@ int DetectFastPatternTest120(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; content:\"oneonetwo\"; fast_pattern:3,4; http_uri; uricontent:\"three\"; depth:30; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -3445,7 +3445,7 @@ int DetectFastPatternTest121(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; uricontent:\"two\"; distance:10; content:\"oneonethree\"; fast_pattern:3,4; http_uri; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -3475,7 +3475,7 @@ int DetectFastPatternTest122(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; uricontent:\"two\"; within:10; content:\"oneonethree\"; fast_pattern:3,4; http_uri; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -3505,7 +3505,7 @@ int DetectFastPatternTest123(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; uricontent:\"two\"; offset:10; content:\"oneonethree\"; fast_pattern:3,4; http_uri; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -3535,7 +3535,7 @@ int DetectFastPatternTest124(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; uricontent:\"two\"; depth:10; content:\"oneonethree\"; fast_pattern:3,4; http_uri; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -3568,7 +3568,7 @@ int DetectFastPatternTest125(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; content:\"two\"; fast_pattern:65977,4; http_uri; uricontent:\"three\"; distance:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -3590,7 +3590,7 @@ int DetectFastPatternTest126(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; content:\"oneonetwo\"; fast_pattern:3,65977; http_uri; uricontent:\"three\"; distance:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -3612,7 +3612,7 @@ int DetectFastPatternTest127(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; content:\"two\"; fast_pattern:65534,4; http_uri; uricontent:\"three\"; distance:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -3634,7 +3634,7 @@ int DetectFastPatternTest128(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; content:!\"oneonetwo\"; fast_pattern:3,4; http_uri; uricontent:\"three\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -3665,7 +3665,7 @@ int DetectFastPatternTest129(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; content:!\"oneonetwo\"; fast_pattern:3,4; http_uri; distance:10; uricontent:\"three\"; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -3687,7 +3687,7 @@ int DetectFastPatternTest130(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; content:!\"oneonetwo\"; fast_pattern:3,4; http_uri; within:10; uricontent:\"three\"; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -3709,7 +3709,7 @@ int DetectFastPatternTest131(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; content:!\"twooneone\"; fast_pattern:3,4; http_uri; offset:10; uricontent:\"three\"; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -3731,7 +3731,7 @@ int DetectFastPatternTest132(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; content:!\"oneonetwo\"; fast_pattern:3,4; http_uri; depth:10; uricontent:\"three\"; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -3753,7 +3753,7 @@ int DetectFastPatternTest133(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(uricontent:\"one\"; content:!\"oneonetwo\"; fast_pattern:3,4; http_uri; uricontent:\"three\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -3789,7 +3789,7 @@ int DetectFastPatternTest134(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_client_body; content:!\"oneonetwo\"; fast_pattern:3,4; http_client_body; content:\"three\"; http_client_body; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -3824,7 +3824,7 @@ int DetectFastPatternTest135(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"/one/\"; fast_pattern:only; http_client_body; "
                                "msg:\"Testing fast_pattern\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
@@ -3861,7 +3861,7 @@ int DetectFastPatternTest136(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"oneoneone\"; fast_pattern:3,4; http_client_body; "
                                "msg:\"Testing fast_pattern\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
@@ -3894,7 +3894,7 @@ int DetectFastPatternTest137(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; fast_pattern:only; http_client_body; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -3928,7 +3928,7 @@ int DetectFastPatternTest138(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"oneoneone\"; fast_pattern:3,4; http_client_body; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -3961,7 +3961,7 @@ int DetectFastPatternTest139(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_client_body; content:\"two\"; fast_pattern:only; http_client_body; distance:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -3983,7 +3983,7 @@ int DetectFastPatternTest140(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_client_body; content:\"two\"; distance:10; fast_pattern:only; http_client_body; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -4005,7 +4005,7 @@ int DetectFastPatternTest141(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_client_body; content:\"two\"; fast_pattern:only; http_client_body; within:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -4027,7 +4027,7 @@ int DetectFastPatternTest142(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_client_body; content:\"two\"; within:10; fast_pattern:only; http_client_body; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -4049,7 +4049,7 @@ int DetectFastPatternTest143(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_client_body; content:\"two\"; fast_pattern:only; http_client_body; offset:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -4071,7 +4071,7 @@ int DetectFastPatternTest144(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_client_body; content:\"two\"; offset:10; fast_pattern:only; http_client_body; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -4093,7 +4093,7 @@ int DetectFastPatternTest145(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_client_body; content:\"two\"; fast_pattern:only; http_client_body; depth:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -4115,7 +4115,7 @@ int DetectFastPatternTest146(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_client_body; content:\"two\"; depth:10; fast_pattern:only; http_client_body; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -4137,7 +4137,7 @@ int DetectFastPatternTest147(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_client_body; content:!\"two\"; fast_pattern:only; http_client_body; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -4159,7 +4159,7 @@ int DetectFastPatternTest148(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content: \"one\"; http_client_body; content:\"two\"; http_client_body; distance:30; content:\"two\"; fast_pattern:only; http_client_body; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -4190,7 +4190,7 @@ int DetectFastPatternTest149(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_client_body; content:\"two\"; http_client_body; within:30; content:\"two\"; fast_pattern:only; http_client_body; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -4220,7 +4220,7 @@ int DetectFastPatternTest150(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_client_body; content:\"two\"; http_client_body; offset:30; content:\"two\"; fast_pattern:only; http_client_body; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -4250,7 +4250,7 @@ int DetectFastPatternTest151(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_client_body; content:\"two\"; http_client_body; depth:30; content:\"two\"; fast_pattern:only; http_client_body; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -4280,7 +4280,7 @@ int DetectFastPatternTest152(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:!\"one\"; fast_pattern; http_client_body; content:\"two\"; http_client_body; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -4311,7 +4311,7 @@ int DetectFastPatternTest153(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_client_body; content:!\"one\"; fast_pattern; http_client_body; distance:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -4333,7 +4333,7 @@ int DetectFastPatternTest154(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_client_body; content:!\"one\"; fast_pattern; http_client_body; within:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -4355,7 +4355,7 @@ int DetectFastPatternTest155(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_client_body; content:!\"one\"; fast_pattern; http_client_body; offset:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -4377,7 +4377,7 @@ int DetectFastPatternTest156(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_client_body; content:!\"one\"; fast_pattern; http_client_body; depth:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -4399,7 +4399,7 @@ int DetectFastPatternTest157(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_client_body; content:\"oneonetwo\"; fast_pattern:3,4; http_client_body; content:\"three\"; http_client_body; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -4429,7 +4429,7 @@ int DetectFastPatternTest158(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_client_body; content:\"oneonetwo\"; fast_pattern:3,4; http_client_body; content:\"three\"; http_client_body; distance:30; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -4459,7 +4459,7 @@ int DetectFastPatternTest159(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_client_body; content:\"oneonetwo\"; fast_pattern:3,4; http_client_body; content:\"three\"; http_client_body; within:30; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -4489,7 +4489,7 @@ int DetectFastPatternTest160(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_client_body; content:\"oneonetwo\"; fast_pattern:3,4; http_client_body; content:\"three\"; http_client_body; offset:30; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -4519,7 +4519,7 @@ int DetectFastPatternTest161(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_client_body; content:\"oneonetwo\"; fast_pattern:3,4; http_client_body; content:\"three\"; http_client_body; depth:30; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -4549,7 +4549,7 @@ int DetectFastPatternTest162(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_client_body; content:\"two\"; http_client_body; distance:10; content:\"oneonethree\"; fast_pattern:3,4; http_client_body; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -4579,7 +4579,7 @@ int DetectFastPatternTest163(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_client_body; content:\"two\"; http_client_body; within:10; content:\"oneonethree\"; fast_pattern:3,4; http_client_body; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -4609,7 +4609,7 @@ int DetectFastPatternTest164(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_client_body; content:\"two\"; http_client_body; offset:10; content:\"oneonethree\"; fast_pattern:3,4; http_client_body; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -4639,7 +4639,7 @@ int DetectFastPatternTest165(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_client_body; content:\"two\"; http_client_body; depth:10; content:\"oneonethree\"; fast_pattern:3,4; http_client_body; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -4672,7 +4672,7 @@ int DetectFastPatternTest166(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_client_body; content:\"two\"; fast_pattern:65977,4; http_client_body; content:\"three\"; http_client_body; distance:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -4694,7 +4694,7 @@ int DetectFastPatternTest167(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\";  http_client_body; content:\"oneonetwo\"; fast_pattern:3,65977; http_client_body; content:\"three\"; distance:10; http_client_body; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -4716,7 +4716,7 @@ int DetectFastPatternTest168(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_client_body; content:\"two\"; fast_pattern:65534,4; http_client_body; content:\"three\"; http_client_body; distance:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -4738,7 +4738,7 @@ int DetectFastPatternTest169(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_client_body; content:!\"oneonetwo\"; fast_pattern:3,4; http_client_body; content:\"three\"; http_client_body; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -4769,7 +4769,7 @@ int DetectFastPatternTest170(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_client_body; content:!\"oneonetwo\"; fast_pattern:3,4; http_client_body; distance:10; content:\"three\"; http_client_body; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -4791,7 +4791,7 @@ int DetectFastPatternTest171(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_client_body; content:!\"oneonetwo\"; fast_pattern:3,4; http_client_body; within:10; content:\"three\"; http_client_body; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -4813,7 +4813,7 @@ int DetectFastPatternTest172(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_client_body; content:!\"twooneone\"; fast_pattern:3,4; http_client_body; offset:10; content:\"three\"; http_client_body; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -4835,7 +4835,7 @@ int DetectFastPatternTest173(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_client_body; content:!\"oneonetwo\"; fast_pattern:3,4; http_client_body; depth:10; content:\"three\"; http_client_body; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -4857,7 +4857,7 @@ int DetectFastPatternTest174(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_client_body; content:!\"oneonetwo\"; fast_pattern:3,4; http_client_body; content:\"three\"; http_client_body; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -4893,7 +4893,7 @@ int DetectFastPatternTest175(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; content:!\"one\"; distance:20; fast_pattern; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -4915,7 +4915,7 @@ int DetectFastPatternTest176(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; content:!\"one\"; within:20; fast_pattern; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -4937,7 +4937,7 @@ int DetectFastPatternTest177(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; content:!\"one\"; offset:20; fast_pattern; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -4959,7 +4959,7 @@ int DetectFastPatternTest178(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; content:!\"one\"; depth:20; fast_pattern; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -4985,7 +4985,7 @@ int DetectFastPatternTest179(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_header; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_header; "
                                "content:\"three\"; http_header; sid:1;)");
@@ -5022,7 +5022,7 @@ int DetectFastPatternTest180(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"/one/\"; fast_pattern:only; http_header; "
                                "msg:\"Testing fast_pattern\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
@@ -5059,7 +5059,7 @@ int DetectFastPatternTest181(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"oneoneone\"; fast_pattern:3,4; http_header; "
                                "msg:\"Testing fast_pattern\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
@@ -5092,7 +5092,7 @@ int DetectFastPatternTest182(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; fast_pattern:only; http_header; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -5126,7 +5126,7 @@ int DetectFastPatternTest183(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"oneoneone\"; fast_pattern:3,4; http_header; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -5159,7 +5159,7 @@ int DetectFastPatternTest184(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_header; content:\"two\"; fast_pattern:only; http_header; distance:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -5181,7 +5181,7 @@ int DetectFastPatternTest185(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_header; content:\"two\"; distance:10; fast_pattern:only; http_header; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -5203,7 +5203,7 @@ int DetectFastPatternTest186(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_header; content:\"two\"; fast_pattern:only; http_header; within:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -5225,7 +5225,7 @@ int DetectFastPatternTest187(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_header; content:\"two\"; within:10; fast_pattern:only; http_header; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -5247,7 +5247,7 @@ int DetectFastPatternTest188(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_header; content:\"two\"; fast_pattern:only; http_header; offset:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -5269,7 +5269,7 @@ int DetectFastPatternTest189(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_header; content:\"two\"; offset:10; fast_pattern:only; http_header; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -5291,7 +5291,7 @@ int DetectFastPatternTest190(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_header; content:\"two\"; fast_pattern:only; http_header; depth:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -5313,7 +5313,7 @@ int DetectFastPatternTest191(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_header; content:\"two\"; depth:10; fast_pattern:only; http_header; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -5335,7 +5335,7 @@ int DetectFastPatternTest192(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_header; content:!\"two\"; fast_pattern:only; http_header; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -5357,7 +5357,7 @@ int DetectFastPatternTest193(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content: \"one\"; http_header; content:\"two\"; http_header; distance:30; content:\"two\"; fast_pattern:only; http_header; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -5388,7 +5388,7 @@ int DetectFastPatternTest194(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_header; content:\"two\"; http_header; within:30; content:\"two\"; fast_pattern:only; http_header; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -5418,7 +5418,7 @@ int DetectFastPatternTest195(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_header; content:\"two\"; http_header; offset:30; content:\"two\"; fast_pattern:only; http_header; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -5448,7 +5448,7 @@ int DetectFastPatternTest196(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_header; content:\"two\"; http_header; depth:30; content:\"two\"; fast_pattern:only; http_header; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -5478,7 +5478,7 @@ int DetectFastPatternTest197(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:!\"one\"; fast_pattern; http_header; content:\"two\"; http_header; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -5509,7 +5509,7 @@ int DetectFastPatternTest198(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_header; content:!\"one\"; fast_pattern; http_header; distance:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -5531,7 +5531,7 @@ int DetectFastPatternTest199(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_header; content:!\"one\"; fast_pattern; http_header; within:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -5553,7 +5553,7 @@ int DetectFastPatternTest200(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_header; content:!\"one\"; fast_pattern; http_header; offset:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -5575,7 +5575,7 @@ int DetectFastPatternTest201(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_header; content:!\"one\"; fast_pattern; http_header; depth:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -5597,7 +5597,7 @@ int DetectFastPatternTest202(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_header; content:\"oneonetwo\"; fast_pattern:3,4; http_header; content:\"three\"; http_header; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -5627,7 +5627,7 @@ int DetectFastPatternTest203(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_header; content:\"oneonetwo\"; fast_pattern:3,4; http_header; content:\"three\"; http_header; distance:30; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -5657,7 +5657,7 @@ int DetectFastPatternTest204(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_header; content:\"oneonetwo\"; fast_pattern:3,4; http_header; content:\"three\"; http_header; within:30; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -5687,7 +5687,7 @@ int DetectFastPatternTest205(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_header; content:\"oneonetwo\"; fast_pattern:3,4; http_header; content:\"three\"; http_header; offset:30; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -5717,7 +5717,7 @@ int DetectFastPatternTest206(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_header; content:\"oneonetwo\"; fast_pattern:3,4; http_header; content:\"three\"; http_header; depth:30; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -5747,7 +5747,7 @@ int DetectFastPatternTest207(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_header; content:\"two\"; http_header; distance:10; content:\"oneonethree\"; fast_pattern:3,4; http_header; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -5777,7 +5777,7 @@ int DetectFastPatternTest208(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_header; content:\"two\"; http_header; within:10; content:\"oneonethree\"; fast_pattern:3,4; http_header; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -5807,7 +5807,7 @@ int DetectFastPatternTest209(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_header; content:\"two\"; http_header; offset:10; content:\"oneonethree\"; fast_pattern:3,4; http_header; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -5837,7 +5837,7 @@ int DetectFastPatternTest210(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_header; content:\"two\"; http_header; depth:10; content:\"oneonethree\"; fast_pattern:3,4; http_header; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -5870,7 +5870,7 @@ int DetectFastPatternTest211(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_header; content:\"two\"; fast_pattern:65977,4; http_header; content:\"three\"; http_header; distance:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -5892,7 +5892,7 @@ int DetectFastPatternTest212(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\";  http_header; content:\"oneonetwo\"; fast_pattern:3,65977; http_header; content:\"three\"; distance:10; http_header; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -5914,7 +5914,7 @@ int DetectFastPatternTest213(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_header; content:\"two\"; fast_pattern:65534,4; http_header; content:\"three\"; http_header; distance:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -5936,7 +5936,7 @@ int DetectFastPatternTest214(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_header; content:!\"oneonetwo\"; fast_pattern:3,4; http_header; content:\"three\"; http_header; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -5967,7 +5967,7 @@ int DetectFastPatternTest215(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_header; content:!\"oneonetwo\"; fast_pattern:3,4; http_header; distance:10; content:\"three\"; http_header; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -5989,7 +5989,7 @@ int DetectFastPatternTest216(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_header; content:!\"oneonetwo\"; fast_pattern:3,4; http_header; within:10; content:\"three\"; http_header; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -6011,7 +6011,7 @@ int DetectFastPatternTest217(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_header; content:!\"oneonetwo\"; fast_pattern:3,4; http_header; offset:10; content:\"three\"; http_header; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -6033,7 +6033,7 @@ int DetectFastPatternTest218(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_header; content:!\"oneonetwo\"; fast_pattern:3,4; http_header; depth:10; content:\"three\"; http_header; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -6055,7 +6055,7 @@ int DetectFastPatternTest219(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_header; content:!\"oneonetwo\"; fast_pattern:3,4; http_header; content:\"three\"; http_header; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -7197,7 +7197,7 @@ int DetectFastPatternTest261(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_method; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_method; "
                                "content:\"three\"; http_method; sid:1;)");
@@ -7234,7 +7234,7 @@ int DetectFastPatternTest262(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"/one/\"; fast_pattern:only; http_method; "
                                "msg:\"Testing fast_pattern\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
@@ -7271,7 +7271,7 @@ int DetectFastPatternTest263(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"oneoneone\"; fast_pattern:3,4; http_method; "
                                "msg:\"Testing fast_pattern\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
@@ -7304,7 +7304,7 @@ int DetectFastPatternTest264(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; fast_pattern:only; http_method; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -7338,7 +7338,7 @@ int DetectFastPatternTest265(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"oneoneone\"; fast_pattern:3,4; http_method; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -7371,7 +7371,7 @@ int DetectFastPatternTest266(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_method; content:\"two\"; fast_pattern:only; http_method; distance:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -7393,7 +7393,7 @@ int DetectFastPatternTest267(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_method; content:\"two\"; distance:10; fast_pattern:only; http_method; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -7415,7 +7415,7 @@ int DetectFastPatternTest268(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_method; content:\"two\"; fast_pattern:only; http_method; within:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -7437,7 +7437,7 @@ int DetectFastPatternTest269(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_method; content:\"two\"; within:10; fast_pattern:only; http_method; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -7459,7 +7459,7 @@ int DetectFastPatternTest270(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_method; content:\"two\"; fast_pattern:only; http_method; offset:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -7481,7 +7481,7 @@ int DetectFastPatternTest271(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_method; content:\"two\"; offset:10; fast_pattern:only; http_method; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -7503,7 +7503,7 @@ int DetectFastPatternTest272(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_method; content:\"two\"; fast_pattern:only; http_method; depth:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -7525,7 +7525,7 @@ int DetectFastPatternTest273(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_method; content:\"two\"; depth:10; fast_pattern:only; http_method; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -7547,7 +7547,7 @@ int DetectFastPatternTest274(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_method; content:!\"two\"; fast_pattern:only; http_method; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -7569,7 +7569,7 @@ int DetectFastPatternTest275(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content: \"one\"; http_method; content:\"two\"; http_method; distance:30; content:\"two\"; fast_pattern:only; http_method; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -7600,7 +7600,7 @@ int DetectFastPatternTest276(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_method; content:\"two\"; http_method; within:30; content:\"two\"; fast_pattern:only; http_method; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -7630,7 +7630,7 @@ int DetectFastPatternTest277(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_method; content:\"two\"; http_method; offset:30; content:\"two\"; fast_pattern:only; http_method; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -7660,7 +7660,7 @@ int DetectFastPatternTest278(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_method; content:\"two\"; http_method; depth:30; content:\"two\"; fast_pattern:only; http_method; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -7690,7 +7690,7 @@ int DetectFastPatternTest279(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:!\"one\"; fast_pattern; http_method; content:\"two\"; http_method; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -7721,7 +7721,7 @@ int DetectFastPatternTest280(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_method; content:!\"one\"; fast_pattern; http_method; distance:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -7743,7 +7743,7 @@ int DetectFastPatternTest281(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_method; content:!\"one\"; fast_pattern; http_method; within:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -7765,7 +7765,7 @@ int DetectFastPatternTest282(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_method; content:!\"one\"; fast_pattern; http_method; offset:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -7787,7 +7787,7 @@ int DetectFastPatternTest283(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_method; content:!\"one\"; fast_pattern; http_method; depth:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -7809,7 +7809,7 @@ int DetectFastPatternTest284(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_method; content:\"oneonetwo\"; fast_pattern:3,4; http_method; content:\"three\"; http_method; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -7839,7 +7839,7 @@ int DetectFastPatternTest285(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_method; content:\"oneonetwo\"; fast_pattern:3,4; http_method; content:\"three\"; http_method; distance:30; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -7869,7 +7869,7 @@ int DetectFastPatternTest286(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_method; content:\"oneonetwo\"; fast_pattern:3,4; http_method; content:\"three\"; http_method; within:30; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -7899,7 +7899,7 @@ int DetectFastPatternTest287(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_method; content:\"oneonetwo\"; fast_pattern:3,4; http_method; content:\"three\"; http_method; offset:30; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -7929,7 +7929,7 @@ int DetectFastPatternTest288(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_method; content:\"oneonetwo\"; fast_pattern:3,4; http_method; content:\"three\"; http_method; depth:30; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -7959,7 +7959,7 @@ int DetectFastPatternTest289(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_method; content:\"two\"; http_method; distance:10; content:\"oneonethree\"; fast_pattern:3,4; http_method; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -7989,7 +7989,7 @@ int DetectFastPatternTest290(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_method; content:\"two\"; http_method; within:10; content:\"oneonethree\"; fast_pattern:3,4; http_method; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -8019,7 +8019,7 @@ int DetectFastPatternTest291(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_method; content:\"two\"; http_method; offset:10; content:\"oneonethree\"; fast_pattern:3,4; http_method; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -8049,7 +8049,7 @@ int DetectFastPatternTest292(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_method; content:\"two\"; http_method; depth:10; content:\"oneonethree\"; fast_pattern:3,4; http_method; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -8082,7 +8082,7 @@ int DetectFastPatternTest293(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_method; content:\"two\"; fast_pattern:65977,4; http_method; content:\"three\"; http_method; distance:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -8104,7 +8104,7 @@ int DetectFastPatternTest294(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\";  http_method; content:\"oneonetwo\"; fast_pattern:3,65977; http_method; content:\"three\"; distance:10; http_method; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -8126,7 +8126,7 @@ int DetectFastPatternTest295(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_method; content:\"two\"; fast_pattern:65534,4; http_method; content:\"three\"; http_method; distance:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -8148,7 +8148,7 @@ int DetectFastPatternTest296(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_method; content:!\"oneonetwo\"; fast_pattern:3,4; http_method; content:\"three\"; http_method; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -8179,7 +8179,7 @@ int DetectFastPatternTest297(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_method; content:!\"oneonetwo\"; fast_pattern:3,4; http_method; distance:10; content:\"three\"; http_method; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -8201,7 +8201,7 @@ int DetectFastPatternTest298(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_method; content:!\"oneonetwo\"; fast_pattern:3,4; http_method; within:10; content:\"three\"; http_method; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -8223,7 +8223,7 @@ int DetectFastPatternTest299(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_method; content:!\"oneonetwo\"; fast_pattern:3,4; http_method; offset:10; content:\"three\"; http_method; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -8245,7 +8245,7 @@ int DetectFastPatternTest300(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_method; content:!\"oneonetwo\"; fast_pattern:3,4; http_method; depth:10; content:\"three\"; http_method; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -8267,7 +8267,7 @@ int DetectFastPatternTest301(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_method; content:!\"oneonetwo\"; fast_pattern:3,4; http_method; content:\"three\"; http_method; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -8303,7 +8303,7 @@ int DetectFastPatternTest302(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_cookie; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_cookie; "
                                "content:\"three\"; http_cookie; sid:1;)");
@@ -8340,7 +8340,7 @@ int DetectFastPatternTest303(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"/one/\"; fast_pattern:only; http_cookie; "
                                "msg:\"Testing fast_pattern\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
@@ -8377,7 +8377,7 @@ int DetectFastPatternTest304(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"oneoneone\"; fast_pattern:3,4; http_cookie; "
                                "msg:\"Testing fast_pattern\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
@@ -8410,7 +8410,7 @@ int DetectFastPatternTest305(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; fast_pattern:only; http_cookie; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -8444,7 +8444,7 @@ int DetectFastPatternTest306(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"oneoneone\"; fast_pattern:3,4; http_cookie; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -8477,7 +8477,7 @@ int DetectFastPatternTest307(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_cookie; content:\"two\"; fast_pattern:only; http_cookie; distance:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -8499,7 +8499,7 @@ int DetectFastPatternTest308(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_cookie; content:\"two\"; distance:10; fast_pattern:only; http_cookie; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -8521,7 +8521,7 @@ int DetectFastPatternTest309(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_cookie; content:\"two\"; fast_pattern:only; http_cookie; within:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -8543,7 +8543,7 @@ int DetectFastPatternTest310(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_cookie; content:\"two\"; within:10; fast_pattern:only; http_cookie; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -8565,7 +8565,7 @@ int DetectFastPatternTest311(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_cookie; content:\"two\"; fast_pattern:only; http_cookie; offset:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -8587,7 +8587,7 @@ int DetectFastPatternTest312(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_cookie; content:\"two\"; offset:10; fast_pattern:only; http_cookie; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -8609,7 +8609,7 @@ int DetectFastPatternTest313(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_cookie; content:\"two\"; fast_pattern:only; http_cookie; depth:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -8631,7 +8631,7 @@ int DetectFastPatternTest314(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_cookie; content:\"two\"; depth:10; fast_pattern:only; http_cookie; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -8653,7 +8653,7 @@ int DetectFastPatternTest315(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_cookie; content:!\"two\"; fast_pattern:only; http_cookie; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -8675,7 +8675,7 @@ int DetectFastPatternTest316(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content: \"one\"; http_cookie; content:\"two\"; http_cookie; distance:30; content:\"two\"; fast_pattern:only; http_cookie; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -8706,7 +8706,7 @@ int DetectFastPatternTest317(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_cookie; content:\"two\"; http_cookie; within:30; content:\"two\"; fast_pattern:only; http_cookie; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -8736,7 +8736,7 @@ int DetectFastPatternTest318(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_cookie; content:\"two\"; http_cookie; offset:30; content:\"two\"; fast_pattern:only; http_cookie; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -8766,7 +8766,7 @@ int DetectFastPatternTest319(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_cookie; content:\"two\"; http_cookie; depth:30; content:\"two\"; fast_pattern:only; http_cookie; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -8796,7 +8796,7 @@ int DetectFastPatternTest320(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:!\"one\"; fast_pattern; http_cookie; content:\"two\"; http_cookie; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -8827,7 +8827,7 @@ int DetectFastPatternTest321(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_cookie; content:!\"one\"; fast_pattern; http_cookie; distance:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -8849,7 +8849,7 @@ int DetectFastPatternTest322(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_cookie; content:!\"one\"; fast_pattern; http_cookie; within:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -8871,7 +8871,7 @@ int DetectFastPatternTest323(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_cookie; content:!\"one\"; fast_pattern; http_cookie; offset:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -8893,7 +8893,7 @@ int DetectFastPatternTest324(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_cookie; content:!\"one\"; fast_pattern; http_cookie; depth:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -8915,7 +8915,7 @@ int DetectFastPatternTest325(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_cookie; content:\"oneonetwo\"; fast_pattern:3,4; http_cookie; content:\"three\"; http_cookie; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -8945,7 +8945,7 @@ int DetectFastPatternTest326(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_cookie; content:\"oneonetwo\"; fast_pattern:3,4; http_cookie; content:\"three\"; http_cookie; distance:30; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -8975,7 +8975,7 @@ int DetectFastPatternTest327(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_cookie; content:\"oneonetwo\"; fast_pattern:3,4; http_cookie; content:\"three\"; http_cookie; within:30; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -9005,7 +9005,7 @@ int DetectFastPatternTest328(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_cookie; content:\"oneonetwo\"; fast_pattern:3,4; http_cookie; content:\"three\"; http_cookie; offset:30; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -9035,7 +9035,7 @@ int DetectFastPatternTest329(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_cookie; content:\"oneonetwo\"; fast_pattern:3,4; http_cookie; content:\"three\"; http_cookie; depth:30; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -9065,7 +9065,7 @@ int DetectFastPatternTest330(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_cookie; content:\"two\"; http_cookie; distance:10; content:\"oneonethree\"; fast_pattern:3,4; http_cookie; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -9095,7 +9095,7 @@ int DetectFastPatternTest331(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_cookie; content:\"two\"; http_cookie; within:10; content:\"oneonethree\"; fast_pattern:3,4; http_cookie; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -9125,7 +9125,7 @@ int DetectFastPatternTest332(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_cookie; content:\"two\"; http_cookie; offset:10; content:\"oneonethree\"; fast_pattern:3,4; http_cookie; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -9155,7 +9155,7 @@ int DetectFastPatternTest333(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_cookie; content:\"two\"; http_cookie; depth:10; content:\"oneonethree\"; fast_pattern:3,4; http_cookie; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -9188,7 +9188,7 @@ int DetectFastPatternTest334(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_cookie; content:\"two\"; fast_pattern:65977,4; http_cookie; content:\"three\"; http_cookie; distance:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -9210,7 +9210,7 @@ int DetectFastPatternTest335(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\";  http_cookie; content:\"oneonetwo\"; fast_pattern:3,65977; http_cookie; content:\"three\"; distance:10; http_cookie; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -9232,7 +9232,7 @@ int DetectFastPatternTest336(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_cookie; content:\"two\"; fast_pattern:65534,4; http_cookie; content:\"three\"; http_cookie; distance:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -9254,7 +9254,7 @@ int DetectFastPatternTest337(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_cookie; content:!\"oneonetwo\"; fast_pattern:3,4; http_cookie; content:\"three\"; http_cookie; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -9285,7 +9285,7 @@ int DetectFastPatternTest338(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_cookie; content:!\"oneonetwo\"; fast_pattern:3,4; http_cookie; distance:10; content:\"three\"; http_cookie; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -9307,7 +9307,7 @@ int DetectFastPatternTest339(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_cookie; content:!\"oneonetwo\"; fast_pattern:3,4; http_cookie; within:10; content:\"three\"; http_cookie; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -9329,7 +9329,7 @@ int DetectFastPatternTest340(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_cookie; content:!\"oneonetwo\"; fast_pattern:3,4; http_cookie; offset:10; content:\"three\"; http_cookie; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -9351,7 +9351,7 @@ int DetectFastPatternTest341(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_cookie; content:!\"oneonetwo\"; fast_pattern:3,4; http_cookie; depth:10; content:\"three2\"; http_cookie; sid:1;)");
     if (de_ctx->sig_list != NULL)
         goto end;
@@ -9373,7 +9373,7 @@ int DetectFastPatternTest342(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_cookie; content:!\"oneonetwo\"; fast_pattern:3,4; http_cookie; content:\"three\"; http_cookie; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -9409,7 +9409,7 @@ int DetectFastPatternTest343(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_uri; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_raw_uri; "
                                "content:\"three\"; http_raw_uri; sid:1;)");
@@ -9446,7 +9446,7 @@ int DetectFastPatternTest344(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"/one/\"; fast_pattern:only; http_raw_uri; "
                                "msg:\"Testing fast_pattern\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
@@ -9483,7 +9483,7 @@ int DetectFastPatternTest345(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"oneoneone\"; fast_pattern:3,4; http_raw_uri; "
                                "msg:\"Testing fast_pattern\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
@@ -9516,7 +9516,7 @@ int DetectFastPatternTest346(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; fast_pattern:only; http_raw_uri; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -9550,7 +9550,7 @@ int DetectFastPatternTest347(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"oneoneone\"; fast_pattern:3,4; http_raw_uri; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -9583,7 +9583,7 @@ int DetectFastPatternTest348(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_uri; "
                                "content:\"two\"; fast_pattern:only; http_raw_uri; distance:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -9606,7 +9606,7 @@ int DetectFastPatternTest349(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_uri; "
                                "content:\"two\"; distance:10; fast_pattern:only; http_raw_uri; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -9629,7 +9629,7 @@ int DetectFastPatternTest350(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_uri; "
                                "content:\"two\"; fast_pattern:only; http_raw_uri; within:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -9652,7 +9652,7 @@ int DetectFastPatternTest351(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_uri; "
                                "content:\"two\"; within:10; fast_pattern:only; http_raw_uri; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -9675,7 +9675,7 @@ int DetectFastPatternTest352(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_uri; "
                                "content:\"two\"; fast_pattern:only; http_raw_uri; offset:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -9698,7 +9698,7 @@ int DetectFastPatternTest353(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_uri; "
                                "content:\"two\"; offset:10; fast_pattern:only; http_raw_uri; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -9721,7 +9721,7 @@ int DetectFastPatternTest354(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_uri; "
                                "content:\"two\"; fast_pattern:only; http_raw_uri; depth:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -9744,7 +9744,7 @@ int DetectFastPatternTest355(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_uri; "
                                "content:\"two\"; depth:10; fast_pattern:only; http_raw_uri; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -9767,7 +9767,7 @@ int DetectFastPatternTest356(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_uri; "
                                "content:!\"two\"; fast_pattern:only; http_raw_uri; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -9790,7 +9790,7 @@ int DetectFastPatternTest357(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content: \"one\"; http_raw_uri; "
                                "content:\"two\"; http_raw_uri; distance:30; "
                                "content:\"two\"; fast_pattern:only; http_raw_uri; sid:1;)");
@@ -9823,7 +9823,7 @@ int DetectFastPatternTest358(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_uri; "
                                "content:\"two\"; http_raw_uri; within:30; "
                                "content:\"two\"; fast_pattern:only; http_raw_uri; sid:1;)");
@@ -9855,7 +9855,7 @@ int DetectFastPatternTest359(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_uri; "
                                "content:\"two\"; http_raw_uri; offset:30; "
                                "content:\"two\"; fast_pattern:only; http_raw_uri; sid:1;)");
@@ -9887,7 +9887,7 @@ int DetectFastPatternTest360(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_uri; "
                                "content:\"two\"; http_raw_uri; depth:30; "
                                "content:\"two\"; fast_pattern:only; http_raw_uri; sid:1;)");
@@ -9919,7 +9919,7 @@ int DetectFastPatternTest361(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:!\"one\"; fast_pattern; http_raw_uri; "
                                "content:\"two\"; http_raw_uri; sid:1;)");
     if (de_ctx->sig_list == NULL)
@@ -9951,7 +9951,7 @@ int DetectFastPatternTest362(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_raw_uri; "
                                "content:!\"one\"; fast_pattern; http_raw_uri; distance:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -9974,7 +9974,7 @@ int DetectFastPatternTest363(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_raw_uri; "
                                "content:!\"one\"; fast_pattern; http_raw_uri; within:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -9997,7 +9997,7 @@ int DetectFastPatternTest364(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_raw_uri; "
                                "content:!\"one\"; fast_pattern; http_raw_uri; offset:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -10020,7 +10020,7 @@ int DetectFastPatternTest365(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_raw_uri; "
                                "content:!\"one\"; fast_pattern; http_raw_uri; depth:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -10043,7 +10043,7 @@ int DetectFastPatternTest366(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_uri; "
                                "content:\"oneonetwo\"; fast_pattern:3,4; http_raw_uri; "
                                "content:\"three\"; http_raw_uri; sid:1;)");
@@ -10075,7 +10075,7 @@ int DetectFastPatternTest367(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_uri; "
                                "content:\"oneonetwo\"; fast_pattern:3,4; http_raw_uri; "
                                "content:\"three\"; http_raw_uri; distance:30; sid:1;)");
@@ -10107,7 +10107,7 @@ int DetectFastPatternTest368(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_uri; "
                                "content:\"oneonetwo\"; fast_pattern:3,4; http_raw_uri; "
                                "content:\"three\"; http_raw_uri; within:30; sid:1;)");
@@ -10139,7 +10139,7 @@ int DetectFastPatternTest369(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_uri; "
                                "content:\"oneonetwo\"; fast_pattern:3,4; http_raw_uri; "
                                "content:\"three\"; http_raw_uri; offset:30; sid:1;)");
@@ -10171,7 +10171,7 @@ int DetectFastPatternTest370(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_uri; "
                                "content:\"oneonetwo\"; fast_pattern:3,4; http_raw_uri; "
                                "content:\"three\"; http_raw_uri; depth:30; sid:1;)");
@@ -10203,7 +10203,7 @@ int DetectFastPatternTest371(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_uri; "
                                "content:\"two\"; http_raw_uri; distance:10; "
                                "content:\"oneonethree\"; fast_pattern:3,4; http_raw_uri; sid:1;)");
@@ -10235,7 +10235,7 @@ int DetectFastPatternTest372(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_uri; "
                                "content:\"two\"; http_raw_uri; within:10; "
                                "content:\"oneonethree\"; fast_pattern:3,4; http_raw_uri; sid:1;)");
@@ -10267,7 +10267,7 @@ int DetectFastPatternTest373(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_uri; "
                                "content:\"two\"; http_raw_uri; offset:10; "
                                "content:\"oneonethree\"; fast_pattern:3,4; http_raw_uri; sid:1;)");
@@ -10299,7 +10299,7 @@ int DetectFastPatternTest374(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_uri; "
                                "content:\"two\"; http_raw_uri; depth:10; "
                                "content:\"oneonethree\"; fast_pattern:3,4; http_raw_uri; sid:1;)");
@@ -10334,7 +10334,7 @@ int DetectFastPatternTest375(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_uri; "
                                "content:\"two\"; fast_pattern:65977,4; http_raw_uri; "
                                "content:\"three\"; http_raw_uri; distance:10; sid:1;)");
@@ -10358,7 +10358,7 @@ int DetectFastPatternTest376(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\";  http_raw_uri; "
                                "content:\"oneonetwo\"; fast_pattern:3,65977; http_raw_uri; "
                                "content:\"three\"; distance:10; http_raw_uri; sid:1;)");
@@ -10382,7 +10382,7 @@ int DetectFastPatternTest377(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_uri; "
                                "content:\"two\"; fast_pattern:65534,4; http_raw_uri; "
                                "content:\"three\"; http_raw_uri; distance:10; sid:1;)");
@@ -10406,7 +10406,7 @@ int DetectFastPatternTest378(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_uri; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_raw_uri; "
                                "content:\"three\"; http_raw_uri; sid:1;)");
@@ -10439,7 +10439,7 @@ int DetectFastPatternTest379(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_uri; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_raw_uri; distance:10; "
                                "content:\"three\"; http_raw_uri; sid:1;)");
@@ -10463,7 +10463,7 @@ int DetectFastPatternTest380(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_uri; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_raw_uri; within:10; "
                                "content:\"three\"; http_raw_uri; sid:1;)");
@@ -10487,7 +10487,7 @@ int DetectFastPatternTest381(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_uri; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_raw_uri; offset:10; "
                                "content:\"three\"; http_raw_uri; sid:1;)");
@@ -10511,7 +10511,7 @@ int DetectFastPatternTest382(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_uri; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_raw_uri; depth:10; "
                                "content:\"three\"; http_raw_uri; sid:1;)");
@@ -10535,7 +10535,7 @@ int DetectFastPatternTest383(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_uri; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_raw_uri; "
                                "content:\"three\"; http_raw_uri; sid:1;)");
@@ -10573,7 +10573,7 @@ int DetectFastPatternTest384(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_msg; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_stat_msg; "
                                "content:\"three\"; http_stat_msg; sid:1;)");
@@ -10610,7 +10610,7 @@ int DetectFastPatternTest385(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; fast_pattern:only; http_stat_msg; "
                                "msg:\"Testing fast_pattern\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
@@ -10647,7 +10647,7 @@ int DetectFastPatternTest386(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"oneoneone\"; fast_pattern:3,4; http_stat_msg; "
                                "msg:\"Testing fast_pattern\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
@@ -10680,7 +10680,7 @@ int DetectFastPatternTest387(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; fast_pattern:only; http_stat_msg; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -10716,7 +10716,7 @@ int DetectFastPatternTest388(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"oneoneone\"; fast_pattern:3,4; http_stat_msg; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -10752,7 +10752,7 @@ int DetectFastPatternTest389(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_msg; "
                                "content:\"two\"; fast_pattern:only; http_stat_msg; distance:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -10775,7 +10775,7 @@ int DetectFastPatternTest390(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_msg; "
                                "content:\"two\"; distance:10; fast_pattern:only; http_stat_msg; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -10798,7 +10798,7 @@ int DetectFastPatternTest391(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_msg; "
                                "content:\"two\"; fast_pattern:only; http_stat_msg; within:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -10821,7 +10821,7 @@ int DetectFastPatternTest392(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_msg; "
                                "content:\"two\"; within:10; fast_pattern:only; http_stat_msg; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -10844,7 +10844,7 @@ int DetectFastPatternTest393(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_msg; "
                                "content:\"two\"; fast_pattern:only; http_stat_msg; offset:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -10867,7 +10867,7 @@ int DetectFastPatternTest394(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_msg; "
                                "content:\"two\"; offset:10; fast_pattern:only; http_stat_msg; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -10890,7 +10890,7 @@ int DetectFastPatternTest395(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_msg; "
                                "content:\"two\"; fast_pattern:only; http_stat_msg; depth:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -10913,7 +10913,7 @@ int DetectFastPatternTest396(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_msg; "
                                "content:\"two\"; depth:10; fast_pattern:only; http_stat_msg; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -10936,7 +10936,7 @@ int DetectFastPatternTest397(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_msg; "
                                "content:!\"two\"; fast_pattern:only; http_stat_msg; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -10959,7 +10959,7 @@ int DetectFastPatternTest398(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\" one\"; http_stat_msg; "
                                "content:\"two\"; http_stat_msg; distance:30; "
                                "content:\"two\"; fast_pattern:only; http_stat_msg; sid:1;)");
@@ -10992,7 +10992,7 @@ int DetectFastPatternTest399(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_msg; "
                                "content:\"two\"; http_stat_msg; within:30; "
                                "content:\"two\"; fast_pattern:only; http_stat_msg; sid:1;)");
@@ -11024,7 +11024,7 @@ int DetectFastPatternTest400(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_msg; "
                                "content:\"two\"; http_stat_msg; offset:30; "
                                "content:\"two\"; fast_pattern:only; http_stat_msg; sid:1;)");
@@ -11056,7 +11056,7 @@ int DetectFastPatternTest401(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_msg; "
                                "content:\"two\"; http_stat_msg; depth:30; "
                                "content:\"two\"; fast_pattern:only; http_stat_msg; sid:1;)");
@@ -11088,7 +11088,7 @@ int DetectFastPatternTest402(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:!\"one\"; fast_pattern; http_stat_msg; "
                                "content:\"two\"; http_stat_msg; sid:1;)");
     if (de_ctx->sig_list == NULL)
@@ -11120,7 +11120,7 @@ int DetectFastPatternTest403(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_stat_msg; "
                                "content:!\"one\"; fast_pattern; http_stat_msg; distance:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -11143,7 +11143,7 @@ int DetectFastPatternTest404(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_stat_msg; "
                                "content:!\"one\"; fast_pattern; http_stat_msg; within:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -11166,7 +11166,7 @@ int DetectFastPatternTest405(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_stat_msg; "
                                "content:!\"one\"; fast_pattern; http_stat_msg; offset:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -11189,7 +11189,7 @@ int DetectFastPatternTest406(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_stat_msg; "
                                "content:!\"one\"; fast_pattern; http_stat_msg; depth:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -11212,7 +11212,7 @@ int DetectFastPatternTest407(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_msg; "
                                "content:\"oneonetwo\"; fast_pattern:3,4; http_stat_msg; "
                                "content:\"three\"; http_stat_msg; sid:1;)");
@@ -11244,7 +11244,7 @@ int DetectFastPatternTest408(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_msg; "
                                "content:\"oneonetwo\"; fast_pattern:3,4; http_stat_msg; "
                                "content:\"three\"; http_stat_msg; distance:30; sid:1;)");
@@ -11276,7 +11276,7 @@ int DetectFastPatternTest409(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_msg; "
                                "content:\"oneonetwo\"; fast_pattern:3,4; http_stat_msg; "
                                "content:\"three\"; http_stat_msg; within:30; sid:1;)");
@@ -11308,7 +11308,7 @@ int DetectFastPatternTest410(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_msg; "
                                "content:\"oneonetwo\"; fast_pattern:3,4; http_stat_msg; "
                                "content:\"three\"; http_stat_msg; offset:30; sid:1;)");
@@ -11340,7 +11340,7 @@ int DetectFastPatternTest411(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_msg; "
                                "content:\"oneonetwo\"; fast_pattern:3,4; http_stat_msg; "
                                "content:\"three\"; http_stat_msg; depth:30; sid:1;)");
@@ -11372,7 +11372,7 @@ int DetectFastPatternTest412(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_msg; "
                                "content:\"two\"; http_stat_msg; distance:10; "
                                "content:\"oneonethree\"; fast_pattern:3,4; http_stat_msg; sid:1;)");
@@ -11404,7 +11404,7 @@ int DetectFastPatternTest413(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_msg; "
                                "content:\"two\"; http_stat_msg; within:10; "
                                "content:\"oneonethree\"; fast_pattern:3,4; http_stat_msg; sid:1;)");
@@ -11436,7 +11436,7 @@ int DetectFastPatternTest414(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_msg; "
                                "content:\"two\"; http_stat_msg; offset:10; "
                                "content:\"oneonethree\"; fast_pattern:3,4; http_stat_msg; sid:1;)");
@@ -11468,7 +11468,7 @@ int DetectFastPatternTest415(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_msg; "
                                "content:\"two\"; http_stat_msg; depth:10; "
                                "content:\"oneonethree\"; fast_pattern:3,4; http_stat_msg; sid:1;)");
@@ -11503,7 +11503,7 @@ int DetectFastPatternTest416(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_msg; "
                                "content:\"two\"; fast_pattern:65977,4; http_stat_msg; "
                                "content:\"three\"; http_stat_msg; distance:10; sid:1;)");
@@ -11527,7 +11527,7 @@ int DetectFastPatternTest417(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\";  http_stat_msg; "
                                "content:\"oneonetwo\"; fast_pattern:3,65977; http_stat_msg; "
                                "content:\"three\"; distance:10; http_stat_msg; sid:1;)");
@@ -11551,7 +11551,7 @@ int DetectFastPatternTest418(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_msg; "
                                "content:\"two\"; fast_pattern:65534,4; http_stat_msg; "
                                "content:\"three\"; http_stat_msg; distance:10; sid:1;)");
@@ -11575,7 +11575,7 @@ int DetectFastPatternTest419(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_msg; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_stat_msg; "
                                "content:\"three\"; http_stat_msg; sid:1;)");
@@ -11608,7 +11608,7 @@ int DetectFastPatternTest420(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_msg; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_stat_msg; distance:10; "
                                "content:\"three\"; http_stat_msg; sid:1;)");
@@ -11632,7 +11632,7 @@ int DetectFastPatternTest421(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_msg; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_stat_msg; within:10; "
                                "content:\"three\"; http_stat_msg; sid:1;)");
@@ -11656,7 +11656,7 @@ int DetectFastPatternTest422(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_msg; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_stat_msg; offset:10; "
                                "content:\"three\"; http_stat_msg; sid:1;)");
@@ -11680,7 +11680,7 @@ int DetectFastPatternTest423(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_msg; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_stat_msg; depth:10; "
                                "content:\"three\"; http_stat_msg; sid:1;)");
@@ -11704,7 +11704,7 @@ int DetectFastPatternTest424(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_msg; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_stat_msg; "
                                "content:\"three\"; http_stat_msg; sid:1;)");
@@ -11742,7 +11742,7 @@ int DetectFastPatternTest425(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_code; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_stat_code; "
                                "content:\"three\"; http_stat_code; sid:1;)");
@@ -11779,7 +11779,7 @@ int DetectFastPatternTest426(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; fast_pattern:only; http_stat_code; "
                                "msg:\"Testing fast_pattern\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
@@ -11816,7 +11816,7 @@ int DetectFastPatternTest427(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"oneoneone\"; fast_pattern:3,4; http_stat_code; "
                                "msg:\"Testing fast_pattern\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
@@ -11849,7 +11849,7 @@ int DetectFastPatternTest428(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; fast_pattern:only; http_stat_code; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -11886,7 +11886,7 @@ int DetectFastPatternTest429(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"oneoneone\"; fast_pattern:3,4; http_stat_code; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -11922,7 +11922,7 @@ int DetectFastPatternTest430(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_code; "
                                "content:\"two\"; fast_pattern:only; http_stat_code; distance:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -11945,7 +11945,7 @@ int DetectFastPatternTest431(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_code; "
                                "content:\"two\"; distance:10; fast_pattern:only; http_stat_code; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -11968,7 +11968,7 @@ int DetectFastPatternTest432(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_code; "
                                "content:\"two\"; fast_pattern:only; http_stat_code; within:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -11991,7 +11991,7 @@ int DetectFastPatternTest433(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_code; "
                                "content:\"two\"; within:10; fast_pattern:only; http_stat_code; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -12014,7 +12014,7 @@ int DetectFastPatternTest434(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_code; "
                                "content:\"two\"; fast_pattern:only; http_stat_code; offset:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -12037,7 +12037,7 @@ int DetectFastPatternTest435(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_code; "
                                "content:\"two\"; offset:10; fast_pattern:only; http_stat_code; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -12060,7 +12060,7 @@ int DetectFastPatternTest436(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_code; "
                                "content:\"two\"; fast_pattern:only; http_stat_code; depth:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -12083,7 +12083,7 @@ int DetectFastPatternTest437(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_code; "
                                "content:\"two\"; depth:10; fast_pattern:only; http_stat_code; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -12106,7 +12106,7 @@ int DetectFastPatternTest438(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_code; "
                                "content:!\"two\"; fast_pattern:only; http_stat_code; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -12129,7 +12129,7 @@ int DetectFastPatternTest439(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\" one\"; http_stat_code; "
                                "content:\"two\"; http_stat_code; distance:30; "
                                "content:\"two\"; fast_pattern:only; http_stat_code; sid:1;)");
@@ -12162,7 +12162,7 @@ int DetectFastPatternTest440(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_code; "
                                "content:\"two\"; http_stat_code; within:30; "
                                "content:\"two\"; fast_pattern:only; http_stat_code; sid:1;)");
@@ -12194,7 +12194,7 @@ int DetectFastPatternTest441(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_code; "
                                "content:\"two\"; http_stat_code; offset:30; "
                                "content:\"two\"; fast_pattern:only; http_stat_code; sid:1;)");
@@ -12226,7 +12226,7 @@ int DetectFastPatternTest442(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_code; "
                                "content:\"two\"; http_stat_code; depth:30; "
                                "content:\"two\"; fast_pattern:only; http_stat_code; sid:1;)");
@@ -12258,7 +12258,7 @@ int DetectFastPatternTest443(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:!\"one\"; fast_pattern; http_stat_code; "
                                "content:\"two\"; http_stat_code; sid:1;)");
     if (de_ctx->sig_list == NULL)
@@ -12290,7 +12290,7 @@ int DetectFastPatternTest444(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_stat_code; "
                                "content:!\"one\"; fast_pattern; http_stat_code; distance:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -12313,7 +12313,7 @@ int DetectFastPatternTest445(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_stat_code; "
                                "content:!\"one\"; fast_pattern; http_stat_code; within:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -12336,7 +12336,7 @@ int DetectFastPatternTest446(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_stat_code; "
                                "content:!\"one\"; fast_pattern; http_stat_code; offset:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -12359,7 +12359,7 @@ int DetectFastPatternTest447(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_stat_code; "
                                "content:!\"one\"; fast_pattern; http_stat_code; depth:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -12382,7 +12382,7 @@ int DetectFastPatternTest448(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_code; "
                                "content:\"oneonetwo\"; fast_pattern:3,4; http_stat_code; "
                                "content:\"three\"; http_stat_code; sid:1;)");
@@ -12414,7 +12414,7 @@ int DetectFastPatternTest449(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_code; "
                                "content:\"oneonetwo\"; fast_pattern:3,4; http_stat_code; "
                                "content:\"three\"; http_stat_code; distance:30; sid:1;)");
@@ -12446,7 +12446,7 @@ int DetectFastPatternTest450(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_code; "
                                "content:\"oneonetwo\"; fast_pattern:3,4; http_stat_code; "
                                "content:\"three\"; http_stat_code; within:30; sid:1;)");
@@ -12478,7 +12478,7 @@ int DetectFastPatternTest451(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_code; "
                                "content:\"oneonetwo\"; fast_pattern:3,4; http_stat_code; "
                                "content:\"three\"; http_stat_code; offset:30; sid:1;)");
@@ -12510,7 +12510,7 @@ int DetectFastPatternTest452(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_code; "
                                "content:\"oneonetwo\"; fast_pattern:3,4; http_stat_code; "
                                "content:\"three\"; http_stat_code; depth:30; sid:1;)");
@@ -12542,7 +12542,7 @@ int DetectFastPatternTest453(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_code; "
                                "content:\"two\"; http_stat_code; distance:10; "
                                "content:\"oneonethree\"; fast_pattern:3,4; http_stat_code; sid:1;)");
@@ -12574,7 +12574,7 @@ int DetectFastPatternTest454(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_code; "
                                "content:\"two\"; http_stat_code; within:10; "
                                "content:\"oneonethree\"; fast_pattern:3,4; http_stat_code; sid:1;)");
@@ -12606,7 +12606,7 @@ int DetectFastPatternTest455(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_code; "
                                "content:\"two\"; http_stat_code; offset:10; "
                                "content:\"oneonethree\"; fast_pattern:3,4; http_stat_code; sid:1;)");
@@ -12638,7 +12638,7 @@ int DetectFastPatternTest456(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_code; "
                                "content:\"two\"; http_stat_code; depth:10; "
                                "content:\"oneonethree\"; fast_pattern:3,4; http_stat_code; sid:1;)");
@@ -12673,7 +12673,7 @@ int DetectFastPatternTest457(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_code; "
                                "content:\"two\"; fast_pattern:65977,4; http_stat_code; "
                                "content:\"three\"; http_stat_code; distance:10; sid:1;)");
@@ -12697,7 +12697,7 @@ int DetectFastPatternTest458(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\";  http_stat_code; "
                                "content:\"oneonetwo\"; fast_pattern:3,65977; http_stat_code; "
                                "content:\"three\"; distance:10; http_stat_code; sid:1;)");
@@ -12721,7 +12721,7 @@ int DetectFastPatternTest459(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_code; "
                                "content:\"two\"; fast_pattern:65534,4; http_stat_code; "
                                "content:\"three\"; http_stat_code; distance:10; sid:1;)");
@@ -12745,7 +12745,7 @@ int DetectFastPatternTest460(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_code; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_stat_code; "
                                "content:\"three\"; http_stat_code; sid:1;)");
@@ -12778,7 +12778,7 @@ int DetectFastPatternTest461(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_code; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_stat_code; distance:10; "
                                "content:\"three\"; http_stat_code; sid:1;)");
@@ -12802,7 +12802,7 @@ int DetectFastPatternTest462(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_code; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_stat_code; within:10; "
                                "content:\"three\"; http_stat_code; sid:1;)");
@@ -12826,7 +12826,7 @@ int DetectFastPatternTest463(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_code; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_stat_code; offset:10; "
                                "content:\"three\"; http_stat_code; sid:1;)");
@@ -12850,7 +12850,7 @@ int DetectFastPatternTest464(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_code; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_stat_code; depth:10; "
                                "content:\"three\"; http_stat_code; sid:1;)");
@@ -12874,7 +12874,7 @@ int DetectFastPatternTest465(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_stat_code; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_stat_code; "
                                "content:\"three\"; http_stat_code; sid:1;)");
@@ -12912,7 +12912,7 @@ int DetectFastPatternTest466(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_server_body; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_server_body; "
                                "content:\"three\"; http_server_body; sid:1;)");
@@ -12950,7 +12950,7 @@ int DetectFastPatternTest467(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; fast_pattern:only; http_server_body; "
                                "msg:\"Testing fast_pattern\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
@@ -12987,7 +12987,7 @@ int DetectFastPatternTest468(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"oneoneone\"; fast_pattern:3,4; http_server_body; "
                                "msg:\"Testing fast_pattern\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
@@ -13020,7 +13020,7 @@ int DetectFastPatternTest469(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; fast_pattern:only; http_server_body; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -13056,7 +13056,7 @@ int DetectFastPatternTest470(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"oneoneone\"; fast_pattern:3,4; http_server_body; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -13092,7 +13092,7 @@ int DetectFastPatternTest471(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_server_body; "
                                "content:\"two\"; fast_pattern:only; http_server_body; distance:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -13115,7 +13115,7 @@ int DetectFastPatternTest472(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_server_body; "
                                "content:\"two\"; distance:10; fast_pattern:only; http_server_body; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -13138,7 +13138,7 @@ int DetectFastPatternTest473(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_server_body; "
                                "content:\"two\"; fast_pattern:only; http_server_body; within:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -13161,7 +13161,7 @@ int DetectFastPatternTest474(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_server_body; "
                                "content:\"two\"; within:10; fast_pattern:only; http_server_body; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -13184,7 +13184,7 @@ int DetectFastPatternTest475(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_server_body; "
                                "content:\"two\"; fast_pattern:only; http_server_body; offset:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -13207,7 +13207,7 @@ int DetectFastPatternTest476(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_server_body; "
                                "content:\"two\"; offset:10; fast_pattern:only; http_server_body; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -13230,7 +13230,7 @@ int DetectFastPatternTest477(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_server_body; "
                                "content:\"two\"; fast_pattern:only; http_server_body; depth:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -13253,7 +13253,7 @@ int DetectFastPatternTest478(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_server_body; "
                                "content:\"two\"; depth:10; fast_pattern:only; http_server_body; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -13276,7 +13276,7 @@ int DetectFastPatternTest479(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_server_body; "
                                "content:!\"two\"; fast_pattern:only; http_server_body; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -13299,7 +13299,7 @@ int DetectFastPatternTest480(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\" one\"; http_server_body; "
                                "content:\"two\"; http_server_body; distance:30; "
                                "content:\"two\"; fast_pattern:only; http_server_body; sid:1;)");
@@ -13332,7 +13332,7 @@ int DetectFastPatternTest481(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_server_body; "
                                "content:\"two\"; http_server_body; within:30; "
                                "content:\"two\"; fast_pattern:only; http_server_body; sid:1;)");
@@ -13365,7 +13365,7 @@ int DetectFastPatternTest482(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_server_body; "
                                "content:\"two\"; http_server_body; offset:30; "
                                "content:\"two\"; fast_pattern:only; http_server_body; sid:1;)");
@@ -13398,7 +13398,7 @@ int DetectFastPatternTest483(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_server_body; "
                                "content:\"two\"; http_server_body; depth:30; "
                                "content:\"two\"; fast_pattern:only; http_server_body; sid:1;)");
@@ -13431,7 +13431,7 @@ int DetectFastPatternTest484(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:!\"one\"; fast_pattern; http_server_body; "
                                "content:\"two\"; http_server_body; sid:1;)");
     if (de_ctx->sig_list == NULL)
@@ -13464,7 +13464,7 @@ int DetectFastPatternTest485(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_server_body; "
                                "content:!\"one\"; fast_pattern; http_server_body; distance:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -13487,7 +13487,7 @@ int DetectFastPatternTest486(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_server_body; "
                                "content:!\"one\"; fast_pattern; http_server_body; within:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -13510,7 +13510,7 @@ int DetectFastPatternTest487(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_server_body; "
                                "content:!\"one\"; fast_pattern; http_server_body; offset:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -13533,7 +13533,7 @@ int DetectFastPatternTest488(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_server_body; "
                                "content:!\"one\"; fast_pattern; http_server_body; depth:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -13556,7 +13556,7 @@ int DetectFastPatternTest489(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_server_body; "
                                "content:\"oneonetwo\"; fast_pattern:3,4; http_server_body; "
                                "content:\"three\"; http_server_body; sid:1;)");
@@ -13589,7 +13589,7 @@ int DetectFastPatternTest490(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_server_body; "
                                "content:\"oneonetwo\"; fast_pattern:3,4; http_server_body; "
                                "content:\"three\"; http_server_body; distance:30; sid:1;)");
@@ -13622,7 +13622,7 @@ int DetectFastPatternTest491(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_server_body; "
                                "content:\"oneonetwo\"; fast_pattern:3,4; http_server_body; "
                                "content:\"three\"; http_server_body; within:30; sid:1;)");
@@ -13655,7 +13655,7 @@ int DetectFastPatternTest492(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_server_body; "
                                "content:\"oneonetwo\"; fast_pattern:3,4; http_server_body; "
                                "content:\"three\"; http_server_body; offset:30; sid:1;)");
@@ -13688,7 +13688,7 @@ int DetectFastPatternTest493(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_server_body; "
                                "content:\"oneonetwo\"; fast_pattern:3,4; http_server_body; "
                                "content:\"three\"; http_server_body; depth:30; sid:1;)");
@@ -13721,7 +13721,7 @@ int DetectFastPatternTest494(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_server_body; "
                                "content:\"two\"; http_server_body; distance:10; "
                                "content:\"oneonethree\"; fast_pattern:3,4; http_server_body; sid:1;)");
@@ -13754,7 +13754,7 @@ int DetectFastPatternTest495(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_server_body; "
                                "content:\"two\"; http_server_body; within:10; "
                                "content:\"oneonethree\"; fast_pattern:3,4; http_server_body; sid:1;)");
@@ -13787,7 +13787,7 @@ int DetectFastPatternTest496(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_server_body; "
                                "content:\"two\"; http_server_body; offset:10; "
                                "content:\"oneonethree\"; fast_pattern:3,4; http_server_body; sid:1;)");
@@ -13820,7 +13820,7 @@ int DetectFastPatternTest497(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_server_body; "
                                "content:\"two\"; http_server_body; depth:10; "
                                "content:\"oneonethree\"; fast_pattern:3,4; http_server_body; sid:1;)");
@@ -13856,7 +13856,7 @@ int DetectFastPatternTest498(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_server_body; "
                                "content:\"two\"; fast_pattern:65977,4; http_server_body; "
                                "content:\"three\"; http_server_body; distance:10; sid:1;)");
@@ -13880,7 +13880,7 @@ int DetectFastPatternTest499(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\";  http_server_body; "
                                "content:\"oneonetwo\"; fast_pattern:3,65977; http_server_body; "
                                "content:\"three\"; distance:10; http_server_body; sid:1;)");
@@ -13904,7 +13904,7 @@ int DetectFastPatternTest500(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_server_body; "
                                "content:\"two\"; fast_pattern:65534,4; http_server_body; "
                                "content:\"three\"; http_server_body; distance:10; sid:1;)");
@@ -13928,7 +13928,7 @@ int DetectFastPatternTest501(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_server_body; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_server_body; "
                                "content:\"three\"; http_server_body; sid:1;)");
@@ -13962,7 +13962,7 @@ int DetectFastPatternTest502(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_server_body; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_server_body; distance:10; "
                                "content:\"three\"; http_server_body; sid:1;)");
@@ -13986,7 +13986,7 @@ int DetectFastPatternTest503(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_server_body; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_server_body; within:10; "
                                "content:\"three\"; http_server_body; sid:1;)");
@@ -14010,7 +14010,7 @@ int DetectFastPatternTest504(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_server_body; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_server_body; offset:10; "
                                "content:\"three\"; http_server_body; sid:1;)");
@@ -14034,7 +14034,7 @@ int DetectFastPatternTest505(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_server_body; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_server_body; depth:10; "
                                "content:\"three\"; http_server_body; sid:1;)");
@@ -14058,7 +14058,7 @@ int DetectFastPatternTest506(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_server_body; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_server_body; "
                                "content:\"three\"; http_server_body; sid:1;)");
@@ -14087,39 +14087,22 @@ int DetectFastPatternTest506(void)
 /* http_server_body fast_pattern tests ^ */
 /* file_data fast_pattern tests v */
 
-
-int DetectFastPatternTest507(void)
+/** \test file_data and icmp don't mix */
+static int DetectFastPatternTest507(void)
 {
-    DetectEngineCtx *de_ctx = NULL;
-    int result = 0;
-
-    if ( (de_ctx = DetectEngineCtxInit()) == NULL)
-        goto end;
-
+    DetectEngineCtx *de_ctx = DetectEngineCtxInit();
+    FAIL_IF_NULL(de_ctx);
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
-                               "(file_data; content:\"one\"; "
-                               "content:!\"oneonetwo\"; fast_pattern:3,4; "
-                               "content:\"three\"; sid:1;)");
-    if (de_ctx->sig_list == NULL)
-        goto end;
 
-    DetectContentData *ud = (DetectContentData *)de_ctx->sig_list->sm_lists_tail[DETECT_SM_LIST_FILEDATA]->prev->ctx;
-    if (ud->flags & DETECT_CONTENT_FAST_PATTERN &&
-        ud->flags & DETECT_CONTENT_NEGATED &&
-        !(ud->flags & DETECT_CONTENT_FAST_PATTERN_ONLY) &&
-        ud->flags & DETECT_CONTENT_FAST_PATTERN_CHOP &&
-        ud->fp_chop_offset == 3 &&
-        ud->fp_chop_len == 4) {
-        result = 1;
-    } else {
-        result = 0;
-    }
+    Signature *s = DetectEngineAppendSig(de_ctx,
+            "alert icmp any any -> any any "
+            "(file_data; content:\"one\"; "
+            "content:!\"oneonetwo\"; fast_pattern:3,4; "
+            "content:\"three\"; sid:1;)");
+    FAIL_IF_NOT_NULL(s);
 
- end:
-    SigCleanSignatures(de_ctx);
     DetectEngineCtxFree(de_ctx);
-    return result;
+    PASS;
 }
 
 /**
@@ -14135,7 +14118,7 @@ int DetectFastPatternTest508(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(file_data; content:\"one\"; fast_pattern:only; "
                                "msg:\"Testing fast_pattern\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
@@ -14172,7 +14155,7 @@ int DetectFastPatternTest509(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(file_data; content:\"oneoneone\"; fast_pattern:3,4; "
                                "msg:\"Testing fast_pattern\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
@@ -14205,7 +14188,7 @@ int DetectFastPatternTest510(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(file_data; content:\"one\"; fast_pattern:only; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -14241,7 +14224,7 @@ int DetectFastPatternTest511(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(file_data; content:\"oneoneone\"; fast_pattern:3,4; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -14277,7 +14260,7 @@ int DetectFastPatternTest512(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(file_data; content:\"one\"; "
                                "content:\"two\"; fast_pattern:only; distance:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -14300,7 +14283,7 @@ int DetectFastPatternTest513(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(file_data; content:\"one\"; "
                                "content:\"two\"; distance:10; fast_pattern:only; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -14323,7 +14306,7 @@ int DetectFastPatternTest514(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(file_data; content:\"one\"; "
                                "content:\"two\"; fast_pattern:only; within:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -14346,7 +14329,7 @@ int DetectFastPatternTest515(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(file_data; content:\"one\"; "
                                "content:\"two\"; within:10; fast_pattern:only; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -14369,7 +14352,7 @@ int DetectFastPatternTest516(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(file_data; content:\"one\"; "
                                "content:\"two\"; fast_pattern:only;  offset:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -14392,7 +14375,7 @@ int DetectFastPatternTest517(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(file_data; content:\"one\"; "
                                "content:\"two\"; offset:10; fast_pattern:only; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -14415,7 +14398,7 @@ int DetectFastPatternTest518(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(file_data; content:\"one\"; "
                                "content:\"two\"; fast_pattern:only; depth:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -14438,7 +14421,7 @@ int DetectFastPatternTest519(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(file_data; content:\"one\"; "
                                "content:\"two\"; depth:10; fast_pattern:only; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -14461,7 +14444,7 @@ int DetectFastPatternTest520(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(file_data; content:\"one\"; "
                                "content:!\"two\"; fast_pattern:only; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -14484,7 +14467,7 @@ int DetectFastPatternTest521(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(file_data; content:\" one\"; "
                                "content:\"two\"; distance:30; "
                                "content:\"two\"; fast_pattern:only; sid:1;)");
@@ -14517,7 +14500,7 @@ int DetectFastPatternTest522(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(file_data; content:\"one\"; "
                                "content:\"two\"; within:30; "
                                "content:\"two\"; fast_pattern:only; sid:1;)");
@@ -14550,7 +14533,7 @@ int DetectFastPatternTest523(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(file_data; content:\"one\"; "
                                "content:\"two\"; offset:30; "
                                "content:\"two\"; fast_pattern:only; sid:1;)");
@@ -14583,7 +14566,7 @@ int DetectFastPatternTest524(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(file_data; content:\"one\"; "
                                "content:\"two\"; depth:30; "
                                "content:\"two\"; fast_pattern:only; sid:1;)");
@@ -14616,7 +14599,7 @@ int DetectFastPatternTest525(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(file_data; content:!\"one\"; fast_pattern; "
                                "content:\"two\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
@@ -14649,7 +14632,7 @@ int DetectFastPatternTest526(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(file_data; content:\"two\"; "
                                "content:!\"one\"; fast_pattern; distance:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -14672,7 +14655,7 @@ int DetectFastPatternTest527(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(file_data; content:\"two\"; "
                                "content:!\"one\"; fast_pattern; within:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -14695,7 +14678,7 @@ int DetectFastPatternTest528(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(file_data; content:\"two\"; "
                                "content:!\"one\"; fast_pattern; offset:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -14718,7 +14701,7 @@ int DetectFastPatternTest529(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(file_data; content:\"two\"; "
                                "content:!\"one\"; fast_pattern; depth:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -14741,7 +14724,7 @@ int DetectFastPatternTest530(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(file_data; content:\"one\"; "
                                "content:\"oneonetwo\"; fast_pattern:3,4;  "
                                "content:\"three\"; sid:1;)");
@@ -14774,7 +14757,7 @@ int DetectFastPatternTest531(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(file_data; content:\"one\"; "
                                "content:\"oneonetwo\"; fast_pattern:3,4; "
                                "content:\"three\"; distance:30; sid:1;)");
@@ -14807,7 +14790,7 @@ int DetectFastPatternTest532(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(file_data; content:\"one\"; "
                                "content:\"oneonetwo\"; fast_pattern:3,4; "
                                "content:\"three\"; within:30; sid:1;)");
@@ -14840,7 +14823,7 @@ int DetectFastPatternTest533(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(file_data; content:\"one\"; "
                                "content:\"oneonetwo\"; fast_pattern:3,4; "
                                "content:\"three\"; offset:30; sid:1;)");
@@ -14873,7 +14856,7 @@ int DetectFastPatternTest534(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(file_data; content:\"one\"; "
                                "content:\"oneonetwo\"; fast_pattern:3,4; "
                                "content:\"three\"; depth:30; sid:1;)");
@@ -14906,7 +14889,7 @@ int DetectFastPatternTest535(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(file_data; content:\"one\"; "
                                "content:\"two\"; distance:10; "
                                "content:\"oneonethree\"; fast_pattern:3,4; sid:1;)");
@@ -14939,7 +14922,7 @@ int DetectFastPatternTest536(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(file_data; content:\"one\"; "
                                "content:\"two\"; within:10; "
                                "content:\"oneonethree\"; fast_pattern:3,4; sid:1;)");
@@ -14972,7 +14955,7 @@ int DetectFastPatternTest537(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(file_data; content:\"one\"; "
                                "content:\"two\"; offset:10; "
                                "content:\"oneonethree\"; fast_pattern:3,4; sid:1;)");
@@ -15005,7 +14988,7 @@ int DetectFastPatternTest538(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(file_data; content:\"one\"; "
                                "content:\"two\"; depth:10; "
                                "content:\"oneonethree\"; fast_pattern:3,4; sid:1;)");
@@ -15041,7 +15024,7 @@ int DetectFastPatternTest539(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(file_data; content:\"one\"; "
                                "content:\"two\"; fast_pattern:65977,4; "
                                "content:\"three\"; distance:10; sid:1;)");
@@ -15065,7 +15048,7 @@ int DetectFastPatternTest540(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(file_data; content:\"one\"; "
                                "content:\"oneonetwo\"; fast_pattern:3,65977; "
                                "content:\"three\"; distance:10; sid:1;)");
@@ -15089,7 +15072,7 @@ int DetectFastPatternTest541(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(file_data; content:\"one\"; "
                                "content:\"two\"; fast_pattern:65534,4; "
                                "content:\"three\"; distance:10; sid:1;)");
@@ -15113,7 +15096,7 @@ int DetectFastPatternTest542(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(file_data; content:\"one\"; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; "
                                "content:\"three\"; sid:1;)");
@@ -15147,7 +15130,7 @@ int DetectFastPatternTest543(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(file_data; content:\"one\"; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; distance:10; "
                                "content:\"three\"; sid:1;)");
@@ -15171,7 +15154,7 @@ int DetectFastPatternTest544(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(file_data; content:\"one\"; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; within:10; "
                                "content:\"three\"; sid:1;)");
@@ -15195,7 +15178,7 @@ int DetectFastPatternTest545(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(file_data; content:\"one\"; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; offset:10; "
                                "content:\"three\"; sid:1;)");
@@ -15219,7 +15202,7 @@ int DetectFastPatternTest546(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(file_data; content:\"one\"; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; depth:10; "
                                "content:\"three\"; sid:1;)");
@@ -15243,7 +15226,7 @@ int DetectFastPatternTest547(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(file_data; content:\"one\"; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; "
                                "content:\"three\"; sid:1;)");
@@ -15282,7 +15265,7 @@ int DetectFastPatternTest548(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_user_agent; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_user_agent; "
                                "content:\"three\"; http_user_agent; sid:1;)");
@@ -15320,7 +15303,7 @@ int DetectFastPatternTest549(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; fast_pattern:only; http_user_agent; "
                                "msg:\"Testing fast_pattern\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
@@ -15357,7 +15340,7 @@ int DetectFastPatternTest550(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"oneoneone\"; fast_pattern:3,4; http_user_agent; "
                                "msg:\"Testing fast_pattern\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
@@ -15390,7 +15373,7 @@ int DetectFastPatternTest551(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; fast_pattern:only; http_user_agent; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -15426,7 +15409,7 @@ int DetectFastPatternTest552(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"oneoneone\"; fast_pattern:3,4; http_user_agent; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -15462,7 +15445,7 @@ int DetectFastPatternTest553(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_user_agent; "
                                "content:\"two\"; fast_pattern:only; http_user_agent; distance:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -15485,7 +15468,7 @@ int DetectFastPatternTest554(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_user_agent; "
                                "content:\"two\"; distance:10; fast_pattern:only; http_user_agent; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -15508,7 +15491,7 @@ int DetectFastPatternTest555(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_user_agent; "
                                "content:\"two\"; fast_pattern:only; http_user_agent; within:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -15531,7 +15514,7 @@ int DetectFastPatternTest556(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_user_agent; "
                                "content:\"two\"; within:10; fast_pattern:only; http_user_agent; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -15554,7 +15537,7 @@ int DetectFastPatternTest557(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_user_agent; "
                                "content:\"two\"; fast_pattern:only; http_user_agent; offset:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -15577,7 +15560,7 @@ int DetectFastPatternTest558(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_user_agent; "
                                "content:\"two\"; offset:10; fast_pattern:only; http_user_agent; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -15600,7 +15583,7 @@ int DetectFastPatternTest559(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_user_agent; "
                                "content:\"two\"; fast_pattern:only; http_user_agent; depth:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -15623,7 +15606,7 @@ int DetectFastPatternTest560(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_user_agent; "
                                "content:\"two\"; depth:10; fast_pattern:only; http_user_agent; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -15646,7 +15629,7 @@ int DetectFastPatternTest561(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_user_agent; "
                                "content:!\"two\"; fast_pattern:only; http_user_agent; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -15669,7 +15652,7 @@ int DetectFastPatternTest562(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\" one\"; http_user_agent; "
                                "content:\"two\"; http_user_agent; distance:30; "
                                "content:\"two\"; fast_pattern:only; http_user_agent; sid:1;)");
@@ -15702,7 +15685,7 @@ int DetectFastPatternTest563(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_user_agent; "
                                "content:\"two\"; http_user_agent; within:30; "
                                "content:\"two\"; fast_pattern:only; http_user_agent; sid:1;)");
@@ -15734,7 +15717,7 @@ int DetectFastPatternTest564(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_user_agent; "
                                "content:\"two\"; http_user_agent; offset:30; "
                                "content:\"two\"; fast_pattern:only; http_user_agent; sid:1;)");
@@ -15766,7 +15749,7 @@ int DetectFastPatternTest565(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_user_agent; "
                                "content:\"two\"; http_user_agent; depth:30; "
                                "content:\"two\"; fast_pattern:only; http_user_agent; sid:1;)");
@@ -15798,7 +15781,7 @@ int DetectFastPatternTest566(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:!\"one\"; fast_pattern; http_user_agent; "
                                "content:\"two\"; http_user_agent; sid:1;)");
     if (de_ctx->sig_list == NULL)
@@ -15830,7 +15813,7 @@ int DetectFastPatternTest567(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_user_agent; "
                                "content:!\"one\"; fast_pattern; http_user_agent; distance:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -15853,7 +15836,7 @@ int DetectFastPatternTest568(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_user_agent; "
                                "content:!\"one\"; fast_pattern; http_user_agent; within:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -15876,7 +15859,7 @@ int DetectFastPatternTest569(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_user_agent; "
                                "content:!\"one\"; fast_pattern; http_user_agent; offset:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -15899,7 +15882,7 @@ int DetectFastPatternTest570(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_user_agent; "
                                "content:!\"one\"; fast_pattern; http_user_agent; depth:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -15922,7 +15905,7 @@ int DetectFastPatternTest571(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_user_agent; "
                                "content:\"oneonetwo\"; fast_pattern:3,4; http_user_agent; "
                                "content:\"three\"; http_user_agent; sid:1;)");
@@ -15954,7 +15937,7 @@ int DetectFastPatternTest572(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_user_agent; "
                                "content:\"oneonetwo\"; fast_pattern:3,4; http_user_agent; "
                                "content:\"three\"; http_user_agent; distance:30; sid:1;)");
@@ -15986,7 +15969,7 @@ int DetectFastPatternTest573(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_user_agent; "
                                "content:\"oneonetwo\"; fast_pattern:3,4; http_user_agent; "
                                "content:\"three\"; http_user_agent; within:30; sid:1;)");
@@ -16018,7 +16001,7 @@ int DetectFastPatternTest574(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_user_agent; "
                                "content:\"oneonetwo\"; fast_pattern:3,4; http_user_agent; "
                                "content:\"three\"; http_user_agent; offset:30; sid:1;)");
@@ -16050,7 +16033,7 @@ int DetectFastPatternTest575(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_user_agent; "
                                "content:\"oneonetwo\"; fast_pattern:3,4; http_user_agent; "
                                "content:\"three\"; http_user_agent; depth:30; sid:1;)");
@@ -16082,7 +16065,7 @@ int DetectFastPatternTest576(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_user_agent; "
                                "content:\"two\"; http_user_agent; distance:10; "
                                "content:\"oneonethree\"; fast_pattern:3,4; http_user_agent; sid:1;)");
@@ -16114,7 +16097,7 @@ int DetectFastPatternTest577(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_user_agent; "
                                "content:\"two\"; http_user_agent; within:10; "
                                "content:\"oneonethree\"; fast_pattern:3,4; http_user_agent; sid:1;)");
@@ -16146,7 +16129,7 @@ int DetectFastPatternTest578(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_user_agent; "
                                "content:\"two\"; http_user_agent; offset:10; "
                                "content:\"oneonethree\"; fast_pattern:3,4; http_user_agent; sid:1;)");
@@ -16178,7 +16161,7 @@ int DetectFastPatternTest579(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_user_agent; "
                                "content:\"two\"; http_user_agent; depth:10; "
                                "content:\"oneonethree\"; fast_pattern:3,4; http_user_agent; sid:1;)");
@@ -16213,7 +16196,7 @@ int DetectFastPatternTest580(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_user_agent; "
                                "content:\"two\"; fast_pattern:65977,4; http_user_agent; "
                                "content:\"three\"; http_user_agent; distance:10; sid:1;)");
@@ -16237,7 +16220,7 @@ int DetectFastPatternTest581(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\";  http_user_agent; "
                                "content:\"oneonetwo\"; fast_pattern:3,65977; http_user_agent; "
                                "content:\"three\"; distance:10; http_user_agent; sid:1;)");
@@ -16261,7 +16244,7 @@ int DetectFastPatternTest582(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_user_agent; "
                                "content:\"two\"; fast_pattern:65534,4; http_user_agent; "
                                "content:\"three\"; http_user_agent; distance:10; sid:1;)");
@@ -16285,7 +16268,7 @@ int DetectFastPatternTest583(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_user_agent; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_user_agent; "
                                "content:\"three\"; http_user_agent; sid:1;)");
@@ -16318,7 +16301,7 @@ int DetectFastPatternTest584(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_user_agent; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_user_agent; distance:10; "
                                "content:\"three\"; http_user_agent; sid:1;)");
@@ -16342,7 +16325,7 @@ int DetectFastPatternTest585(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_user_agent; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_user_agent; within:10; "
                                "content:\"three\"; http_user_agent; sid:1;)");
@@ -16366,7 +16349,7 @@ int DetectFastPatternTest586(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_user_agent; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_user_agent; offset:10; "
                                "content:\"three\"; http_user_agent; sid:1;)");
@@ -16390,7 +16373,7 @@ int DetectFastPatternTest587(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_user_agent; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_user_agent; depth:10; "
                                "content:\"three\"; http_user_agent; sid:1;)");
@@ -16414,7 +16397,7 @@ int DetectFastPatternTest588(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_user_agent; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_user_agent; "
                                "content:\"three\"; http_user_agent; sid:1;)");
@@ -16452,7 +16435,7 @@ int DetectFastPatternTest589(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_host; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_host; "
                                "content:\"three\"; http_host; sid:1;)");
@@ -16489,7 +16472,7 @@ int DetectFastPatternTest590(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; fast_pattern:only; http_host;  "
                                "msg:\"Testing fast_pattern\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
@@ -16526,7 +16509,7 @@ int DetectFastPatternTest591(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"oneoneone\"; fast_pattern:3,4; http_host; "
                                "msg:\"Testing fast_pattern\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
@@ -16559,7 +16542,7 @@ int DetectFastPatternTest592(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; fast_pattern:only; http_host; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -16595,7 +16578,7 @@ int DetectFastPatternTest593(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"oneoneone\"; fast_pattern:3,4; http_host; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -16631,7 +16614,7 @@ int DetectFastPatternTest594(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_host; "
                                "content:\"two\"; fast_pattern:only; http_host; distance:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -16654,7 +16637,7 @@ int DetectFastPatternTest595(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_host; "
                                "content:\"two\"; distance:10; fast_pattern:only; http_host; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -16677,7 +16660,7 @@ int DetectFastPatternTest596(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_host; "
                                "content:\"two\"; fast_pattern:only; http_host; within:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -16700,7 +16683,7 @@ int DetectFastPatternTest597(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_host; "
                                "content:\"two\"; within:10; fast_pattern:only; http_host; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -16723,7 +16706,7 @@ int DetectFastPatternTest598(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_host; "
                                "content:\"two\"; fast_pattern:only; http_host; offset:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -16746,7 +16729,7 @@ int DetectFastPatternTest599(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_host; "
                                "content:\"two\"; offset:10; fast_pattern:only; http_host; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -16769,7 +16752,7 @@ int DetectFastPatternTest600(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_host; "
                                "content:\"two\"; fast_pattern:only; http_host; depth:10; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -16792,7 +16775,7 @@ int DetectFastPatternTest601(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_host; "
                                "content:\"two\"; depth:10; fast_pattern:only; http_host; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -16815,7 +16798,7 @@ int DetectFastPatternTest602(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_host; "
                                "content:!\"two\"; fast_pattern:only; http_host; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -16838,7 +16821,7 @@ int DetectFastPatternTest603(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\" one\"; http_host; "
                                "content:\"two\"; http_host; distance:30; "
                                "content:\"two\"; fast_pattern:only; http_host; sid:1;)");
@@ -16871,7 +16854,7 @@ int DetectFastPatternTest604(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_host; "
                                "content:\"two\"; http_host; within:30; "
                                "content:\"two\"; fast_pattern:only; http_host; sid:1;)");
@@ -16903,7 +16886,7 @@ int DetectFastPatternTest605(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_host; "
                                "content:\"two\"; http_host; offset:30; "
                                "content:\"two\"; fast_pattern:only; http_host; sid:1;)");
@@ -16935,7 +16918,7 @@ int DetectFastPatternTest606(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_host; "
                                "content:\"two\"; http_host; depth:30; "
                                "content:\"two\"; fast_pattern:only; http_host; sid:1;)");
@@ -16967,7 +16950,7 @@ int DetectFastPatternTest607(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:!\"one\"; fast_pattern; http_host; "
                                "content:\"two\"; http_host; sid:1;)");
     if (de_ctx->sig_list == NULL)
@@ -16999,7 +16982,7 @@ int DetectFastPatternTest608(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_host; "
                                "content:!\"one\"; fast_pattern; http_host; distance:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -17022,7 +17005,7 @@ int DetectFastPatternTest609(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_host; "
                                "content:!\"one\"; fast_pattern; http_host; within:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -17045,7 +17028,7 @@ int DetectFastPatternTest610(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_host; "
                                "content:!\"one\"; fast_pattern; http_host; offset:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -17068,7 +17051,7 @@ int DetectFastPatternTest611(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_host; "
                                "content:!\"one\"; fast_pattern; http_host; depth:20; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -17091,7 +17074,7 @@ int DetectFastPatternTest612(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_host; "
                                "content:\"oneonetwo\"; fast_pattern:3,4; http_host; "
                                "content:\"three\"; http_host; sid:1;)");
@@ -17123,7 +17106,7 @@ int DetectFastPatternTest613(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_host; "
                                "content:\"oneonetwo\"; fast_pattern:3,4; http_host; "
                                "content:\"three\"; http_host; distance:30; sid:1;)");
@@ -17155,7 +17138,7 @@ int DetectFastPatternTest614(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_host; "
                                "content:\"oneonetwo\"; fast_pattern:3,4; http_host; "
                                "content:\"three\"; http_host; within:30; sid:1;)");
@@ -17187,7 +17170,7 @@ int DetectFastPatternTest615(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_host; "
                                "content:\"oneonetwo\"; fast_pattern:3,4; http_host; "
                                "content:\"three\"; http_host; offset:30; sid:1;)");
@@ -17219,7 +17202,7 @@ int DetectFastPatternTest616(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_host; "
                                "content:\"oneonetwo\"; fast_pattern:3,4; http_host; "
                                "content:\"three\"; http_host; depth:30; sid:1;)");
@@ -17251,7 +17234,7 @@ int DetectFastPatternTest617(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_host; "
                                "content:\"two\"; http_host; distance:10; "
                                "content:\"oneonethree\"; fast_pattern:3,4; http_host; sid:1;)");
@@ -17283,7 +17266,7 @@ int DetectFastPatternTest618(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_host; "
                                "content:\"two\"; http_host; within:10; "
                                "content:\"oneonethree\"; fast_pattern:3,4; http_host; sid:1;)");
@@ -17315,7 +17298,7 @@ int DetectFastPatternTest619(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_host; "
                                "content:\"two\"; http_host; offset:10; "
                                "content:\"oneonethree\"; fast_pattern:3,4; http_host; sid:1;)");
@@ -17347,7 +17330,7 @@ int DetectFastPatternTest620(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_host; "
                                "content:\"two\"; http_host; depth:10; "
                                "content:\"oneonethree\"; fast_pattern:3,4; http_host; sid:1;)");
@@ -17382,7 +17365,7 @@ int DetectFastPatternTest621(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_host; "
                                "content:\"two\"; fast_pattern:65977,4; http_host; "
                                "content:\"three\"; http_host; distance:10; sid:1;)");
@@ -17406,7 +17389,7 @@ int DetectFastPatternTest622(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\";  http_host; "
                                "content:\"oneonetwo\"; fast_pattern:3,65977; http_host; "
                                "content:\"three\"; distance:10; http_host; sid:1;)");
@@ -17430,7 +17413,7 @@ int DetectFastPatternTest623(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_host; "
                                "content:\"two\"; fast_pattern:65534,4; http_host; "
                                "content:\"three\"; http_host; distance:10; sid:1;)");
@@ -17454,7 +17437,7 @@ int DetectFastPatternTest624(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_host; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_host; "
                                "content:\"three\"; http_host; sid:1;)");
@@ -17487,7 +17470,7 @@ int DetectFastPatternTest625(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_host; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_host; distance:10; "
                                "content:\"three\"; http_host; sid:1;)");
@@ -17511,7 +17494,7 @@ int DetectFastPatternTest626(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_host; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_host; within:10; "
                                "content:\"three\"; http_host; sid:1;)");
@@ -17535,7 +17518,7 @@ int DetectFastPatternTest627(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_host; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_host; offset:10; "
                                "content:\"three\"; http_host; sid:1;)");
@@ -17559,7 +17542,7 @@ int DetectFastPatternTest628(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_host; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_host; depth:10; "
                                "content:\"three\"; http_host; sid:1;)");
@@ -17583,7 +17566,7 @@ int DetectFastPatternTest629(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_host; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_host; "
                                "content:\"three\"; http_host; sid:1;)");
@@ -17621,7 +17604,7 @@ int DetectFastPatternTest630(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_host; nocase; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_raw_host; nocase; "
                                "content:\"three\"; http_raw_host; nocase; sid:1;)");
@@ -17659,7 +17642,7 @@ int DetectFastPatternTest631(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; fast_pattern:only; http_raw_host; nocase; "
                                "msg:\"Testing fast_pattern\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
@@ -17698,7 +17681,7 @@ int DetectFastPatternTest632(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"oneoneone\"; fast_pattern:3,4; http_raw_host; nocase; "
                                "msg:\"Testing fast_pattern\"; sid:1;)");
     if (de_ctx->sig_list == NULL)
@@ -17733,7 +17716,7 @@ int DetectFastPatternTest633(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; fast_pattern:only; http_raw_host; nocase; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -17770,7 +17753,7 @@ int DetectFastPatternTest634(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"oneoneone\"; fast_pattern:3,4; http_raw_host; nocase; sid:1;)");
     if (de_ctx->sig_list == NULL)
         goto end;
@@ -17807,7 +17790,7 @@ int DetectFastPatternTest635(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_host; nocase; "
                                "content:\"two\"; fast_pattern:only; http_raw_host; distance:10; nocase; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -17830,7 +17813,7 @@ int DetectFastPatternTest636(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_host; nocase; "
                                "content:\"two\"; distance:10; fast_pattern:only; http_raw_host; nocase; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -17853,7 +17836,7 @@ int DetectFastPatternTest637(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_host; nocase; "
                                "content:\"two\"; fast_pattern:only; http_raw_host; within:10; nocase; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -17876,7 +17859,7 @@ int DetectFastPatternTest638(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_host; nocase; "
                                "content:\"two\"; within:10; fast_pattern:only; http_raw_host; nocase; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -17899,7 +17882,7 @@ int DetectFastPatternTest639(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_host; nocase; "
                                "content:\"two\"; fast_pattern:only; http_raw_host; offset:10; nocase; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -17922,7 +17905,7 @@ int DetectFastPatternTest640(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_host; nocase; "
                                "content:\"two\"; offset:10; fast_pattern:only; http_raw_host; nocase; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -17945,7 +17928,7 @@ int DetectFastPatternTest641(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_host; nocase; "
                                "content:\"two\"; fast_pattern:only; http_raw_host; depth:10; nocase; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -17968,7 +17951,7 @@ int DetectFastPatternTest642(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_host; nocase; "
                                "content:\"two\"; depth:10; fast_pattern:only; http_raw_host; nocase; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -17991,7 +17974,7 @@ int DetectFastPatternTest643(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_host; nocase; "
                                "content:!\"two\"; fast_pattern:only; http_raw_host; nocase; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -18014,7 +17997,7 @@ int DetectFastPatternTest644(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\" one\"; http_raw_host; nocase; "
                                "content:\"two\"; http_raw_host; distance:30; nocase; "
                                "content:\"two\"; fast_pattern:only; http_raw_host; nocase; sid:1;)");
@@ -18048,7 +18031,7 @@ int DetectFastPatternTest645(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_host; nocase; "
                                "content:\"two\"; http_raw_host; within:30; nocase; "
                                "content:\"two\"; fast_pattern:only; http_raw_host; nocase; sid:1;)");
@@ -18081,7 +18064,7 @@ int DetectFastPatternTest646(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_host; nocase; "
                                "content:\"two\"; http_raw_host; offset:30; nocase; "
                                "content:\"two\"; fast_pattern:only; http_raw_host; nocase; sid:1;)");
@@ -18114,7 +18097,7 @@ int DetectFastPatternTest647(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_host; nocase; "
                                "content:\"two\"; http_raw_host; depth:30; nocase; "
                                "content:\"two\"; fast_pattern:only; http_raw_host; nocase; sid:1;)");
@@ -18147,7 +18130,7 @@ int DetectFastPatternTest648(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:!\"one\"; fast_pattern; http_raw_host; nocase; "
                                "content:\"two\"; http_raw_host; nocase; sid:1;)");
     if (de_ctx->sig_list == NULL)
@@ -18180,7 +18163,7 @@ int DetectFastPatternTest649(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_raw_host; nocase; "
                                "content:!\"one\"; fast_pattern; http_raw_host; distance:20; nocase; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -18203,7 +18186,7 @@ int DetectFastPatternTest650(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_raw_host; nocase; "
                                "content:!\"one\"; fast_pattern; http_raw_host; within:20; nocase; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -18226,7 +18209,7 @@ int DetectFastPatternTest651(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_raw_host; nocase; "
                                "content:!\"one\"; fast_pattern; http_raw_host; offset:20; nocase; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -18249,7 +18232,7 @@ int DetectFastPatternTest652(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_raw_host; nocase; "
                                "content:!\"one\"; fast_pattern; http_raw_host; depth:20; nocase; sid:1;)");
     if (de_ctx->sig_list != NULL)
@@ -18272,7 +18255,7 @@ int DetectFastPatternTest653(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_host; nocase; "
                                "content:\"oneonetwo\"; fast_pattern:3,4; http_raw_host; nocase; "
                                "content:\"three\"; http_raw_host; nocase; sid:1;)");
@@ -18305,7 +18288,7 @@ int DetectFastPatternTest654(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_host; nocase; "
                                "content:\"oneonetwo\"; fast_pattern:3,4; http_raw_host; nocase; "
                                "content:\"three\"; http_raw_host; distance:30; nocase; sid:1;)");
@@ -18338,7 +18321,7 @@ int DetectFastPatternTest655(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_host; nocase; "
                                "content:\"oneonetwo\"; fast_pattern:3,4; http_raw_host; nocase; "
                                "content:\"three\"; http_raw_host; within:30; nocase; sid:1;)");
@@ -18371,7 +18354,7 @@ int DetectFastPatternTest656(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_host; nocase; "
                                "content:\"oneonetwo\"; fast_pattern:3,4; http_raw_host; nocase; "
                                "content:\"three\"; http_raw_host; offset:30; nocase; sid:1;)");
@@ -18404,7 +18387,7 @@ int DetectFastPatternTest657(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_host; nocase; "
                                "content:\"oneonetwo\"; fast_pattern:3,4; http_raw_host; nocase; "
                                "content:\"three\"; http_raw_host; depth:30; nocase; sid:1;)");
@@ -18437,7 +18420,7 @@ int DetectFastPatternTest658(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_host; nocase; "
                                "content:\"two\"; http_raw_host; distance:10; nocase; "
                                "content:\"oneonethree\"; fast_pattern:3,4; http_raw_host; nocase; sid:1;)");
@@ -18470,7 +18453,7 @@ int DetectFastPatternTest659(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_host; nocase; "
                                "content:\"two\"; http_raw_host; within:10; nocase; "
                                "content:\"oneonethree\"; fast_pattern:3,4; http_raw_host; nocase; sid:1;)");
@@ -18503,7 +18486,7 @@ int DetectFastPatternTest660(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_host; nocase; "
                                "content:\"two\"; http_raw_host; offset:10; nocase; "
                                "content:\"oneonethree\"; fast_pattern:3,4; http_raw_host; nocase; sid:1;)");
@@ -18536,7 +18519,7 @@ int DetectFastPatternTest661(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_host; nocase; "
                                "content:\"two\"; http_raw_host; depth:10; nocase; "
                                "content:\"oneonethree\"; fast_pattern:3,4; http_raw_host; nocase; sid:1;)");
@@ -18572,7 +18555,7 @@ int DetectFastPatternTest662(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_host; nocase; "
                                "content:\"two\"; fast_pattern:65977,4; http_raw_host; nocase; "
                                "content:\"three\"; http_raw_host; distance:10; nocase; sid:1;)");
@@ -18596,7 +18579,7 @@ int DetectFastPatternTest663(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\";  http_raw_host; nocase; "
                                "content:\"oneonetwo\"; fast_pattern:3,65977; http_raw_host; nocase; "
                                "content:\"three\"; distance:10; http_raw_host; nocase; sid:1;)");
@@ -18620,7 +18603,7 @@ int DetectFastPatternTest664(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_host; nocase; "
                                "content:\"two\"; fast_pattern:65534,4; http_raw_host; nocase; "
                                "content:\"three\"; http_raw_host; distance:10; nocase; sid:1;)");
@@ -18644,7 +18627,7 @@ int DetectFastPatternTest665(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_host; nocase; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_raw_host; nocase; "
                                "content:\"three\"; http_raw_host; nocase; sid:1;)");
@@ -18678,7 +18661,7 @@ int DetectFastPatternTest666(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_host; nocase; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_raw_host; distance:10; nocase; "
                                "content:\"three\"; http_raw_host; nocase; sid:1;)");
@@ -18702,7 +18685,7 @@ int DetectFastPatternTest667(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_host; nocase; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_raw_host; within:10; nocase; "
                                "content:\"three\"; http_raw_host; nocase; sid:1;)");
@@ -18726,7 +18709,7 @@ int DetectFastPatternTest668(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_host; nocase; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_raw_host; offset:10; nocase; "
                                "content:\"three\"; http_raw_host; nocase; sid:1;)");
@@ -18750,7 +18733,7 @@ int DetectFastPatternTest669(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_host; nocase; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_raw_host; depth:10; nocase; "
                                "content:\"three\"; http_raw_host; nocase; sid:1;)");
@@ -18774,7 +18757,7 @@ int DetectFastPatternTest670(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_raw_host; nocase; "
                                "content:!\"oneonetwo\"; fast_pattern:3,4; http_raw_host; nocase; "
                                "content:\"three\"; http_raw_host; nocase; sid:1;)");

diff --git a/src/detect-http-server-body.c b/src/detect-http-server-body.c
index 5971ed3d5681b0d964c5b81ecf5f2c05b56f1b5d..e1337e59ca61903daeaab895be43ec506f05f67b 100644 (file)
--- a/src/detect-http-server-body.c
+++ b/src/detect-http-server-body.c
@@ -1802,7 +1802,7 @@ int DetectHttpServerBodyTest22(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; content:\"two\"; http_server_body; "
                                "content:\"three\"; distance:10; http_server_body; content:\"four\"; sid:1;)");
     if (de_ctx->sig_list == NULL) {
@@ -1857,7 +1857,7 @@ int DetectHttpServerBodyTest23(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_server_body; pcre:/two/; "
                                "content:\"three\"; distance:10; http_server_body; content:\"four\"; sid:1;)");
     if (de_ctx->sig_list == NULL) {
@@ -1911,7 +1911,7 @@ int DetectHttpServerBodyTest24(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_server_body; pcre:/two/; "
                                "content:\"three\"; distance:10; within:15; http_server_body; content:\"four\"; sid:1;)");
     if (de_ctx->sig_list == NULL) {
@@ -1965,7 +1965,7 @@ int DetectHttpServerBodyTest25(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_server_body; pcre:/two/; "
                                "content:\"three\"; distance:10; http_server_body; "
                                "content:\"four\"; distance:10; sid:1;)");
@@ -2021,7 +2021,7 @@ int DetectHttpServerBodyTest26(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; offset:10; http_server_body; pcre:/two/; "
                                "content:\"three\"; distance:10; http_server_body; within:10; "
                                "content:\"four\"; distance:10; sid:1;)");
@@ -2078,7 +2078,7 @@ int DetectHttpServerBodyTest27(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; offset:10; http_server_body; pcre:/two/; distance:10; "
                                "content:\"three\"; distance:10; http_server_body; depth:10; "
                                "content:\"four\"; distance:10; sid:1;)");
@@ -2104,7 +2104,7 @@ int DetectHttpServerBodyTest28(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_server_body; pcre:/two/; "
                                "content:\"three\"; http_server_body; depth:10; "
                                "content:\"four\"; distance:10; sid:1;)");
@@ -2160,7 +2160,7 @@ int DetectHttpServerBodyTest29(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_server_body; "
                                "content:\"two\"; distance:0; http_server_body; sid:1;)");
     if (de_ctx->sig_list == NULL) {
@@ -2204,7 +2204,7 @@ int DetectHttpServerBodyTest30(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_server_body; "
                                "content:\"two\"; within:5; http_server_body; sid:1;)");
     if (de_ctx->sig_list == NULL) {
@@ -2248,7 +2248,7 @@ int DetectHttpServerBodyTest31(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; within:5; http_server_body; sid:1;)");
     if (de_ctx->sig_list == NULL) {
         printf("de_ctx->sig_list == NULL\n");
@@ -2272,7 +2272,7 @@ int DetectHttpServerBodyTest32(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; http_server_body; within:5; sid:1;)");
     if (de_ctx->sig_list == NULL) {
         printf("de_ctx->sig_list == NULL\n");
@@ -2296,7 +2296,7 @@ int DetectHttpServerBodyTest33(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"one\"; within:5; sid:1;)");
     if (de_ctx->sig_list == NULL) {
         printf("de_ctx->sig_list == NULL\n");
@@ -2320,7 +2320,7 @@ int DetectHttpServerBodyTest34(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(pcre:/one/Q; "
                                "content:\"two\"; within:5; http_server_body; sid:1;)");
     if (de_ctx->sig_list == NULL) {
@@ -2371,7 +2371,7 @@ int DetectHttpServerBodyTest35(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(content:\"two\"; http_server_body; "
                                "pcre:/one/QR; sid:1;)");
     if (de_ctx->sig_list == NULL) {
@@ -2422,7 +2422,7 @@ int DetectHttpServerBodyTest36(void)
         goto end;
 
     de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert icmp any any -> any any "
+    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(pcre:/one/Q; "
                                "content:\"two\"; distance:5; http_server_body; sid:1;)");
     if (de_ctx->sig_list == NULL) {
@@ -2490,7 +2490,6 @@ static int DetectHttpServerBodyFileDataTest01(void)
         "\r\n"
         "message";
     uint32_t http_len2 = sizeof(http_buf2) - 1;
-    int result = 0;
     AppLayerParserThreadCtx *alp_tctx = AppLayerParserThreadCtxAlloc();
 
     memset(&th_v, 0, sizeof(th_v));
@@ -2513,74 +2512,43 @@ static int DetectHttpServerBodyFileDataTest01(void)
     StreamTcpInitConfig(TRUE);
 
     de_ctx = DetectEngineCtxInit();
-    if (de_ctx == NULL)
-        goto end;
-
+    FAIL_IF_NULL(de_ctx);
     de_ctx->flags |= DE_QUIET;
 
     de_ctx->sig_list = SigInit(de_ctx,"alert http any any -> any any "
                                "(msg:\"http server body test\"; "
                                "file_data; content:\"message\"; "
                                "sid:1;)");
-    if (de_ctx->sig_list == NULL)
-        goto end;
+    FAIL_IF_NULL(de_ctx->sig_list);
 
     SigGroupBuild(de_ctx);
     DetectEngineThreadCtxInit(&th_v, (void *)de_ctx, (void *)&det_ctx);
 
-    FLOWLOCK_WRLOCK(&f);
     int r = AppLayerParserParse(NULL, alp_tctx, &f, ALPROTO_HTTP,
                                 STREAM_TOSERVER | STREAM_START | STREAM_EOF,
                                 http_buf,
                                 http_len);
-    if (r != 0) {
-        printf("toserver chunk 1 returned %" PRId32 ", expected 0: ", r);
-        result = 0;
-        FLOWLOCK_UNLOCK(&f);
-        goto end;
-    }
+    FAIL_IF(r != 0);
     r = AppLayerParserParse(NULL, alp_tctx, &f, ALPROTO_HTTP,
                             STREAM_TOCLIENT | STREAM_START | STREAM_EOF,
                             http_buf2,
                             http_len2);
-    if (r != 0) {
-        printf("toserver chunk 1 returned %" PRId32 ", expected 0: ", r);
-        result = 0;
-        FLOWLOCK_UNLOCK(&f);
-        goto end;
-    }
-    FLOWLOCK_UNLOCK(&f);
-
+    FAIL_IF(r != 0);
     http_state = f.alstate;
-    if (http_state == NULL) {
-        printf("no http state: \n");
-        result = 0;
-        goto end;
-    }
+    FAIL_IF_NULL(http_state);
 
     /* do detect */
     SigMatchSignatures(&th_v, de_ctx, det_ctx, p);
 
-    if (!(PacketAlertCheck(p, 1))) {
-        printf("sid 1 didn't match but should have: ");
-        goto end;
-    }
+    FAIL_IF(!(PacketAlertCheck(p, 1)));
 
-    result = 1;
-end:
-    if (alp_tctx != NULL)
-        AppLayerParserThreadCtxFree(alp_tctx);
-    if (de_ctx != NULL)
-        SigGroupCleanup(de_ctx);
-    if (de_ctx != NULL)
-        SigCleanSignatures(de_ctx);
-    if (de_ctx != NULL)
-        DetectEngineCtxFree(de_ctx);
+    AppLayerParserThreadCtxFree(alp_tctx);
+    DetectEngineCtxFree(de_ctx);
 
     StreamTcpFreeConfig(TRUE);
     FLOW_DESTROY(&f);
     UTHFreePackets(&p, 1);
-    return result;
+    PASS;
 }
 
 /**