diff --git a/hivemind/tavern/condenser_api_patterns/get_following_over_limit.orig.json b/hivemind/tavern/condenser_api_negative/get_following/over_limit.orig.json
similarity index 100%
rename from hivemind/tavern/condenser_api_patterns/get_following_over_limit.orig.json
rename to hivemind/tavern/condenser_api_negative/get_following/over_limit.orig.json
diff --git a/hivemind/tavern/condenser_api_patterns/get_following_over_limit.pat.json b/hivemind/tavern/condenser_api_negative/get_following/over_limit.pat.json
similarity index 100%
rename from hivemind/tavern/condenser_api_patterns/get_following_over_limit.pat.json
rename to hivemind/tavern/condenser_api_negative/get_following/over_limit.pat.json
diff --git a/hivemind/tavern/condenser_api_negative/get_following/over_limit.tavern.yaml b/hivemind/tavern/condenser_api_negative/get_following/over_limit.tavern.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..2fc36ea9735730d620c5364285c6f7f6859668dc
--- /dev/null
+++ b/hivemind/tavern/condenser_api_negative/get_following/over_limit.tavern.yaml
@@ -0,0 +1,30 @@
+---
+  test_name: Hivemind condenser_api.get_following over limit test
+
+  marks:
+    - patterntest
+    - negative
+
+  includes:
+    - !include ../../common.yaml
+
+  stages:
+    - name: get_following last
+      request:
+        url: "{service.proto:s}://{service.server:s}:{service.port}/"
+        method: POST
+        headers:
+          content-type: application/json
+        json:
+          jsonrpc: "2.0"
+          id: 1
+          method: "condenser_api.get_following"
+          params: ["gtg","blocktrades","blog",1001]
+      response:
+        status_code: 200
+        verify_response_with:
+          function: validate_response:compare_response_with_pattern
+          extra_kwargs:
+            method: "over_limit"
+            directory: "condenser_api_negative/get_following"
+            error_response: true
\ No newline at end of file
diff --git a/hivemind/tavern/condenser_api_patterns/get_following_wrong_type.orig.json b/hivemind/tavern/condenser_api_negative/get_following/wrong_type.orig.json
similarity index 100%
rename from hivemind/tavern/condenser_api_patterns/get_following_wrong_type.orig.json
rename to hivemind/tavern/condenser_api_negative/get_following/wrong_type.orig.json
diff --git a/hivemind/tavern/condenser_api_patterns/get_following_wrong_type.pat.json b/hivemind/tavern/condenser_api_negative/get_following/wrong_type.pat.json
similarity index 100%
rename from hivemind/tavern/condenser_api_patterns/get_following_wrong_type.pat.json
rename to hivemind/tavern/condenser_api_negative/get_following/wrong_type.pat.json
diff --git a/hivemind/tavern/condenser_api_negative/get_following/wrong_type.tavern.yaml b/hivemind/tavern/condenser_api_negative/get_following/wrong_type.tavern.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..64ecaf5333e1565bd4c3463d58eca732fba86576
--- /dev/null
+++ b/hivemind/tavern/condenser_api_negative/get_following/wrong_type.tavern.yaml
@@ -0,0 +1,30 @@
+---
+  test_name: Hivemind condenser_api.get_following wrong_type patterns test
+
+  marks:
+    - patterntest
+    - negative
+
+  includes:
+    - !include ../../common.yaml
+
+  stages:
+    - name: get_following wrong_type
+      request:
+        url: "{service.proto:s}://{service.server:s}:{service.port}/"
+        method: POST
+        headers:
+          content-type: application/json
+        json:
+          jsonrpc: "2.0"
+          id: 1
+          method: "condenser_api.get_following"
+          params: ["brightnesssoulds",null,"wrong_type",1000]
+      response:
+        status_code: 200
+        verify_response_with:
+          function: validate_response:compare_response_with_pattern
+          extra_kwargs:
+            method: "wrong_type"
+            directory: "condenser_api_negative/get_following"
+            error_response: true
\ No newline at end of file
diff --git a/hivemind/tavern/condenser_api_patterns/get_following.orig.json b/hivemind/tavern/condenser_api_patterns/get_following/blog.orig.json
similarity index 100%
rename from hivemind/tavern/condenser_api_patterns/get_following.orig.json
rename to hivemind/tavern/condenser_api_patterns/get_following/blog.orig.json
diff --git a/hivemind/tavern/condenser_api_patterns/get_following.pat.json b/hivemind/tavern/condenser_api_patterns/get_following/blog.pat.json
similarity index 100%
rename from hivemind/tavern/condenser_api_patterns/get_following.pat.json
rename to hivemind/tavern/condenser_api_patterns/get_following/blog.pat.json
diff --git a/hivemind/tavern/condenser_api_patterns/get_following/blog.tavern.yaml b/hivemind/tavern/condenser_api_patterns/get_following/blog.tavern.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..18a743bd888a9711c45b067c2d3d16e518746e00
--- /dev/null
+++ b/hivemind/tavern/condenser_api_patterns/get_following/blog.tavern.yaml
@@ -0,0 +1,28 @@
+---
+  test_name: Hivemind condenser_api.get_following patterns test
+
+  marks:
+    - patterntest
+
+  includes:
+    - !include ../../common.yaml
+
+  stages:
+    - name: get_following
+      request:
+        url: "{service.proto:s}://{service.server:s}:{service.port}/"
+        method: POST
+        headers:
+          content-type: application/json
+        json:
+          jsonrpc: "2.0"
+          id: 1
+          method: "condenser_api.get_following"
+          params: ["proskynneo",null,"blog",10]
+      response:
+        status_code: 200
+        verify_response_with:
+          function: validate_response:compare_response_with_pattern
+          extra_kwargs:
+            method: "blog"
+            directory: "condenser_api_patterns/get_following"
\ No newline at end of file
diff --git a/hivemind/tavern/condenser_api_patterns/get_following_ignore.orig.json b/hivemind/tavern/condenser_api_patterns/get_following/ignore_type.orig.json
similarity index 100%
rename from hivemind/tavern/condenser_api_patterns/get_following_ignore.orig.json
rename to hivemind/tavern/condenser_api_patterns/get_following/ignore_type.orig.json
diff --git a/hivemind/tavern/condenser_api_patterns/get_following_ignore.pat.json b/hivemind/tavern/condenser_api_patterns/get_following/ignore_type.pat.json
similarity index 100%
rename from hivemind/tavern/condenser_api_patterns/get_following_ignore.pat.json
rename to hivemind/tavern/condenser_api_patterns/get_following/ignore_type.pat.json
diff --git a/hivemind/tavern/condenser_api_patterns/get_following/ignore_type.tavern.yaml b/hivemind/tavern/condenser_api_patterns/get_following/ignore_type.tavern.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ff59256d1d11722284e57f59ff13904b5fb4a43a
--- /dev/null
+++ b/hivemind/tavern/condenser_api_patterns/get_following/ignore_type.tavern.yaml
@@ -0,0 +1,28 @@
+---
+  test_name: Hivemind condenser_api.get_following ignore_type patterns test
+
+  marks:
+    - patterntest
+
+  includes:
+    - !include ../../common.yaml
+
+  stages:
+    - name: get_following ignore_type
+      request:
+        url: "{service.proto:s}://{service.server:s}:{service.port}/"
+        method: POST
+        headers:
+          content-type: application/json
+        json:
+          jsonrpc: "2.0"
+          id: 1
+          method: "condenser_api.get_following"
+          params: ["brightnesssoulds",null,"ignore",1000]
+      response:
+        status_code: 200
+        verify_response_with:
+          function: validate_response:compare_response_with_pattern
+          extra_kwargs:
+            method: "ignore_type"
+            directory: "condenser_api_patterns/get_following"
\ No newline at end of file
diff --git a/hivemind/tavern/condenser_api_patterns/get_following_last.orig.json b/hivemind/tavern/condenser_api_patterns/get_following/last.orig.json
similarity index 100%
rename from hivemind/tavern/condenser_api_patterns/get_following_last.orig.json
rename to hivemind/tavern/condenser_api_patterns/get_following/last.orig.json
diff --git a/hivemind/tavern/condenser_api_patterns/get_following_last.pat.json b/hivemind/tavern/condenser_api_patterns/get_following/last.pat.json
similarity index 100%
rename from hivemind/tavern/condenser_api_patterns/get_following_last.pat.json
rename to hivemind/tavern/condenser_api_patterns/get_following/last.pat.json
diff --git a/hivemind/tavern/condenser_api_patterns/get_following/last.tavern.yaml b/hivemind/tavern/condenser_api_patterns/get_following/last.tavern.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..67398562b5292985025ddc3039b47a3e63ab72ee
--- /dev/null
+++ b/hivemind/tavern/condenser_api_patterns/get_following/last.tavern.yaml
@@ -0,0 +1,28 @@
+---
+  test_name: Hivemind condenser_api.get_following last patterns test
+
+  marks:
+    - patterntest
+
+  includes:
+    - !include ../../common.yaml
+
+  stages:
+    - name: get_following last
+      request:
+        url: "{service.proto:s}://{service.server:s}:{service.port}/"
+        method: POST
+        headers:
+          content-type: application/json
+        json:
+          jsonrpc: "2.0"
+          id: 1
+          method: "condenser_api.get_following"
+          params: ["gtg","blocktrades","blog",1000]
+      response:
+        status_code: 200
+        verify_response_with:
+          function: validate_response:compare_response_with_pattern
+          extra_kwargs:
+            method: "last"
+            directory: "condenser_api_patterns/get_following"
\ No newline at end of file
diff --git a/hivemind/tavern/condenser_api_patterns/get_following_no_following.orig.json b/hivemind/tavern/condenser_api_patterns/get_following/no_following.orig.json
similarity index 100%
rename from hivemind/tavern/condenser_api_patterns/get_following_no_following.orig.json
rename to hivemind/tavern/condenser_api_patterns/get_following/no_following.orig.json
diff --git a/hivemind/tavern/condenser_api_patterns/get_following_no_following.pat.json b/hivemind/tavern/condenser_api_patterns/get_following/no_following.pat.json
similarity index 100%
rename from hivemind/tavern/condenser_api_patterns/get_following_no_following.pat.json
rename to hivemind/tavern/condenser_api_patterns/get_following/no_following.pat.json
diff --git a/hivemind/tavern/condenser_api_patterns/get_following/no_following.tavern.yaml b/hivemind/tavern/condenser_api_patterns/get_following/no_following.tavern.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..b19b68c9c41e13d84fbefb2b0ef027fb3a542bce
--- /dev/null
+++ b/hivemind/tavern/condenser_api_patterns/get_following/no_following.tavern.yaml
@@ -0,0 +1,28 @@
+---
+  test_name: Hivemind condenser_api.get_following no following patterns test
+
+  marks:
+    - patterntest
+
+  includes:
+    - !include ../../common.yaml
+
+  stages:
+    - name: get_following no following
+      request:
+        url: "{service.proto:s}://{service.server:s}:{service.port}/"
+        method: POST
+        headers:
+          content-type: application/json
+        json:
+          jsonrpc: "2.0"
+          id: 1
+          method: "condenser_api.get_following"
+          params: ["test2",null,"blog",1000]
+      response:
+        status_code: 200
+        verify_response_with:
+          function: validate_response:compare_response_with_pattern
+          extra_kwargs:
+            method: "no_following"
+            directory: "condenser_api_patterns/get_following"
\ No newline at end of file
diff --git a/hivemind/tavern/test_condenser_api_patterns.tavern.yaml b/hivemind/tavern/test_condenser_api_patterns.tavern.yaml
index 5875e565504d8591c82ad2a16b370002d3badf5d..0afdadcf2bc83316d7c0f316358ab0eb6255365a 100644
--- a/hivemind/tavern/test_condenser_api_patterns.tavern.yaml
+++ b/hivemind/tavern/test_condenser_api_patterns.tavern.yaml
@@ -1,176 +1,3 @@
----
-  test_name: Hivemind condenser_api.get_following patterns test
-
-  marks:
-    - patterntest
-
-  includes:
-    - !include common.yaml
-
-  stages:
-    - name: get_following
-      request:
-        url: "{service.proto:s}://{service.server:s}:{service.port}/"
-        method: POST
-        headers:
-          content-type: application/json
-        json:
-          jsonrpc: "2.0"
-          id: 1
-          method: "condenser_api.get_following"
-          params: ["proskynneo",null,"blog",10]
-      response:
-        status_code: 200
-        verify_response_with:
-          function: validate_response:compare_response_with_pattern
-          extra_kwargs:
-            method: "get_following"
-            directory: "condenser_api_patterns"
----
-  test_name: Hivemind condenser_api.get_following last patterns test
-
-  marks:
-    - patterntest
-
-  includes:
-    - !include common.yaml
-
-  stages:
-    - name: get_following last
-      request:
-        url: "{service.proto:s}://{service.server:s}:{service.port}/"
-        method: POST
-        headers:
-          content-type: application/json
-        json:
-          jsonrpc: "2.0"
-          id: 1
-          method: "condenser_api.get_following"
-          params: ["gtg","blocktrades","blog",1000]
-      response:
-        status_code: 200
-        verify_response_with:
-          function: validate_response:compare_response_with_pattern
-          extra_kwargs:
-            method: "get_following_last"
-            directory: "condenser_api_patterns"
-
----
-  test_name: Hivemind condenser_api.get_following no following patterns test
-
-  marks:
-    - patterntest
-
-  includes:
-    - !include common.yaml
-
-  stages:
-    - name: get_following no following
-      request:
-        url: "{service.proto:s}://{service.server:s}:{service.port}/"
-        method: POST
-        headers:
-          content-type: application/json
-        json:
-          jsonrpc: "2.0"
-          id: 1
-          method: "condenser_api.get_following"
-          params: ["test2",null,"blog",1000]
-      response:
-        status_code: 200
-        verify_response_with:
-          function: validate_response:compare_response_with_pattern
-          extra_kwargs:
-            method: "get_following_no_following"
-            directory: "condenser_api_patterns"
-
----
-  test_name: Hivemind condenser_api.get_following ignore_type patterns test
-
-  marks:
-    - patterntest
-
-  includes:
-    - !include common.yaml
-
-  stages:
-    - name: get_following ignore_type
-      request:
-        url: "{service.proto:s}://{service.server:s}:{service.port}/"
-        method: POST
-        headers:
-          content-type: application/json
-        json:
-          jsonrpc: "2.0"
-          id: 1
-          method: "condenser_api.get_following"
-          params: ["brightnesssoulds",null,"ignore",1000]
-      response:
-        status_code: 200
-        verify_response_with:
-          function: validate_response:compare_response_with_pattern
-          extra_kwargs:
-            method: "get_following_ignore"
-            directory: "condenser_api_patterns"
----
-  test_name: Hivemind condenser_api.get_following wrong_type patterns test
-
-  marks:
-    - patterntest
-
-  includes:
-    - !include common.yaml
-
-  stages:
-    - name: get_following wrong_type
-      request:
-        url: "{service.proto:s}://{service.server:s}:{service.port}/"
-        method: POST
-        headers:
-          content-type: application/json
-        json:
-          jsonrpc: "2.0"
-          id: 1
-          method: "condenser_api.get_following"
-          params: ["brightnesssoulds",null,"wrong_type",1000]
-      response:
-        status_code: 200
-        verify_response_with:
-          function: validate_response:compare_response_with_pattern
-          extra_kwargs:
-            method: "get_following_wrong_type"
-            directory: "condenser_api_patterns"
-            error_response: true
----
-  test_name: Hivemind condenser_api.get_following over limit test
-
-  marks:
-    - patterntest
-
-  includes:
-    - !include common.yaml
-
-  stages:
-    - name: get_following last
-      request:
-        url: "{service.proto:s}://{service.server:s}:{service.port}/"
-        method: POST
-        headers:
-          content-type: application/json
-        json:
-          jsonrpc: "2.0"
-          id: 1
-          method: "condenser_api.get_following"
-          params: ["gtg","blocktrades","blog",1001]
-      response:
-        status_code: 200
-        verify_response_with:
-          function: validate_response:compare_response_with_pattern
-          extra_kwargs:
-            method: "get_following_over_limit"
-            directory: "condenser_api_patterns"
-            error_response: true
-
 ---
   test_name: Hivemind condenser_api.get_follow_count patterns test