diff --git a/hivemind/tavern/condenser_api_patterns/get_followers_trending_tags_over_limit.orig.json b/hivemind/tavern/condenser_api_negative/get_trending_tags/over_limit.orig.json
similarity index 100%
rename from hivemind/tavern/condenser_api_patterns/get_followers_trending_tags_over_limit.orig.json
rename to hivemind/tavern/condenser_api_negative/get_trending_tags/over_limit.orig.json
diff --git a/hivemind/tavern/condenser_api_patterns/get_followers_trending_tags_over_limit.pat.json b/hivemind/tavern/condenser_api_negative/get_trending_tags/over_limit.pat.json
similarity index 100%
rename from hivemind/tavern/condenser_api_patterns/get_followers_trending_tags_over_limit.pat.json
rename to hivemind/tavern/condenser_api_negative/get_trending_tags/over_limit.pat.json
diff --git a/hivemind/tavern/condenser_api_negative/get_trending_tags/over_limit.tavern.yaml b/hivemind/tavern/condenser_api_negative/get_trending_tags/over_limit.tavern.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..fbeb175c241842d968b567182253edc79083e45d
--- /dev/null
+++ b/hivemind/tavern/condenser_api_negative/get_trending_tags/over_limit.tavern.yaml
@@ -0,0 +1,30 @@
+---
+  test_name: Hivemind condenser_api.get_trending_tags over limit patterns test
+
+  marks:
+    - patterntest
+    - negative
+
+  includes:
+    - !include ../../common.yaml
+
+  stages:
+    - name: get_trending_tags limit 250
+      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_trending_tags"
+          params: {"start_tag": "dream","limit":251}
+      response:
+        status_code: 200
+        verify_response_with:
+          function: validate_response:compare_response_with_pattern
+          extra_kwargs:
+            method: "over_limit"
+            directory: "condenser_api_negative/get_trending_tags"
+            error_response: true
\ No newline at end of file
diff --git a/hivemind/tavern/condenser_api_patterns/get_trending_tags_limit_250.orig.json b/hivemind/tavern/condenser_api_patterns/get_trending_tags/limit_250.orig.json
similarity index 100%
rename from hivemind/tavern/condenser_api_patterns/get_trending_tags_limit_250.orig.json
rename to hivemind/tavern/condenser_api_patterns/get_trending_tags/limit_250.orig.json
diff --git a/hivemind/tavern/condenser_api_patterns/get_trending_tags_limit_250.pat.json b/hivemind/tavern/condenser_api_patterns/get_trending_tags/limit_250.pat.json
similarity index 100%
rename from hivemind/tavern/condenser_api_patterns/get_trending_tags_limit_250.pat.json
rename to hivemind/tavern/condenser_api_patterns/get_trending_tags/limit_250.pat.json
diff --git a/hivemind/tavern/condenser_api_patterns/get_trending_tags/limit_250.tavern.yaml b/hivemind/tavern/condenser_api_patterns/get_trending_tags/limit_250.tavern.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..6ca5a6675aa105cc38568d8c9b6ba11f416ffe59
--- /dev/null
+++ b/hivemind/tavern/condenser_api_patterns/get_trending_tags/limit_250.tavern.yaml
@@ -0,0 +1,28 @@
+---
+  test_name: Hivemind condenser_api.get_trending_tags limit 250 patterns test
+
+  marks:
+    - patterntest # not comparable to original due to ordering influenced by different pending payouts (also order of tags with the same payout was basically random) 
+
+  includes:
+    - !include ../../common.yaml
+
+  stages:
+    - name: get_trending_tags limit 250
+      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_trending_tags"
+          params: {"start_tag": "dream","limit":250}
+      response:
+        status_code: 200
+        verify_response_with:
+          function: validate_response:compare_response_with_pattern
+          extra_kwargs:
+            method: "limit_250"
+            directory: "condenser_api_patterns/get_trending_tags"
\ No newline at end of file
diff --git a/hivemind/tavern/condenser_api_patterns/get_trending_tags.orig.json b/hivemind/tavern/condenser_api_patterns/get_trending_tags/steem.orig.json
similarity index 100%
rename from hivemind/tavern/condenser_api_patterns/get_trending_tags.orig.json
rename to hivemind/tavern/condenser_api_patterns/get_trending_tags/steem.orig.json
diff --git a/hivemind/tavern/condenser_api_patterns/get_trending_tags.pat.json b/hivemind/tavern/condenser_api_patterns/get_trending_tags/steem.pat.json
similarity index 100%
rename from hivemind/tavern/condenser_api_patterns/get_trending_tags.pat.json
rename to hivemind/tavern/condenser_api_patterns/get_trending_tags/steem.pat.json
diff --git a/hivemind/tavern/condenser_api_patterns/get_trending_tags/steem.tavern.yaml b/hivemind/tavern/condenser_api_patterns/get_trending_tags/steem.tavern.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..2408daf9bf660d5c0c3ecbfafa5070bd93f94c42
--- /dev/null
+++ b/hivemind/tavern/condenser_api_patterns/get_trending_tags/steem.tavern.yaml
@@ -0,0 +1,28 @@
+---
+  test_name: Hivemind condenser_api.get_trending_tags patterns test
+
+  marks:
+    - patterntest
+
+  includes:
+    - !include ../../common.yaml
+
+  stages:
+    - name: get_trending_tags
+      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_trending_tags"
+          params: ["steem",10]
+      response:
+        status_code: 200
+        verify_response_with:
+          function: validate_response:compare_response_with_pattern
+          extra_kwargs:
+            method: "steem"
+            directory: "condenser_api_patterns/get_trending_tags"
\ 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 a0b5d8b21ac3d943b939250dabb71de8375dc375..bf85dcd35a566dcc6b0699660d574cd5760ef0cf 100644
--- a/hivemind/tavern/test_condenser_api_patterns.tavern.yaml
+++ b/hivemind/tavern/test_condenser_api_patterns.tavern.yaml
@@ -1,90 +1,3 @@
----
-  test_name: Hivemind condenser_api.get_trending_tags patterns test
-
-  marks:
-    - patterntest
-
-  includes:
-    - !include common.yaml
-
-  stages:
-    - name: get_trending_tags
-      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_trending_tags"
-          params: ["steem",10]
-      response:
-        status_code: 200
-        verify_response_with:
-          function: validate_response:compare_response_with_pattern
-          extra_kwargs:
-            method: "get_trending_tags"
-            directory: "condenser_api_patterns"
-
----
-  test_name: Hivemind condenser_api.get_trending_tags limit 250 patterns test
-
-  marks:
-    - patterntest # not comparable to original due to ordering influenced by different pending payouts (also order of tags with the same payout was basically random) 
-
-  includes:
-    - !include common.yaml
-
-  stages:
-    - name: get_trending_tags limit 250
-      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_trending_tags"
-          params: {"start_tag": "dream","limit":250}
-      response:
-        status_code: 200
-        verify_response_with:
-          function: validate_response:compare_response_with_pattern
-          extra_kwargs:
-            method: "get_trending_tags_limit_250"
-            directory: "condenser_api_patterns"
-
----
-  test_name: Hivemind condenser_api.get_trending_tags over limit patterns test
-
-  marks:
-    - patterntest
-
-  includes:
-    - !include common.yaml
-
-  stages:
-    - name: get_trending_tags limit 250
-      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_trending_tags"
-          params: {"start_tag": "dream","limit":251}
-      response:
-        status_code: 200
-        verify_response_with:
-          function: validate_response:compare_response_with_pattern
-          extra_kwargs:
-            method: "get_followers_trending_tags_over_limit"
-            directory: "condenser_api_patterns"
-            error_response: true
 ---
   test_name: Hivemind condenser_api.get_discussions_by_trending patterns test