diff --git a/tests/ragger/eip712_input_files/address_substitution.json b/tests/ragger/eip712_input_files/address_substitution.json
deleted file mode 100644
index 3cff494..0000000
--- a/tests/ragger/eip712_input_files/address_substitution.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "domain": {
-        "chainId": 1,
-        "name": "Token test",
-        "verifyingContract": "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC",
-        "version": "1"
-    },
-    "message": {
-        "from": "0xaAaAaAaaAaAaAaaAaAAAAAAAAaaaAaAaAaaAaaAa",
-        "to": "0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045",
-        "amount": "117",
-        "token": "0x6B175474E89094C44Da98b954EedeAC495271d0F"
-    },
-    "primaryType": "Transfer",
-    "types": {
-        "EIP712Domain": [
-            { "name": "name", "type": "string" },
-            { "name": "version", "type": "string" },
-            { "name": "chainId", "type": "uint256" },
-            { "name": "verifyingContract", "type": "address" }
-        ],
-        "Transfer": [
-            { "name": "from", "type": "address" },
-            { "name": "to", "type": "address" },
-            { "name": "amount", "type": "uint256" },
-            { "name": "token", "type": "address" }
-        ]
-    }
-}
diff --git a/tests/ragger/snapshots/flex/test_eip712_address_substitution/00001.png b/tests/ragger/snapshots/flex/test_eip712_address_substitution/00001.png
deleted file mode 100644
index 6bdc1e0..0000000
Binary files a/tests/ragger/snapshots/flex/test_eip712_address_substitution/00001.png and /dev/null differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_address_substitution/00002.png b/tests/ragger/snapshots/flex/test_eip712_address_substitution/00002.png
deleted file mode 100644
index 8f98115..0000000
Binary files a/tests/ragger/snapshots/flex/test_eip712_address_substitution/00002.png and /dev/null differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_address_substitution/00004.png b/tests/ragger/snapshots/flex/test_eip712_address_substitution/00004.png
deleted file mode 100644
index a8988ce..0000000
Binary files a/tests/ragger/snapshots/flex/test_eip712_address_substitution/00004.png and /dev/null differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_address_substitution_verbose/00002.png b/tests/ragger/snapshots/flex/test_eip712_address_substitution_verbose/00002.png
deleted file mode 100644
index 16ade57..0000000
Binary files a/tests/ragger/snapshots/flex/test_eip712_address_substitution_verbose/00002.png and /dev/null differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_address_substitution/00000.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00000.png
similarity index 100%
rename from tests/ragger/snapshots/flex/test_eip712_address_substitution/00000.png
rename to tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00000.png
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00001.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00001.png
new file mode 100644
index 0000000..227282a
Binary files /dev/null and b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00001.png differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00002.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00002.png
new file mode 100644
index 0000000..39c6eb0
Binary files /dev/null and b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00002.png differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_address_substitution/00003.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00003.png
similarity index 100%
rename from tests/ragger/snapshots/flex/test_eip712_address_substitution/00003.png
rename to tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00003.png
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00004.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00004.png
new file mode 100644
index 0000000..6fd0c4c
Binary files /dev/null and b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00004.png differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_address_substitution/00005.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00005.png
similarity index 100%
rename from tests/ragger/snapshots/flex/test_eip712_address_substitution/00005.png
rename to tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00005.png
diff --git a/tests/ragger/snapshots/flex/test_eip712_address_substitution/00006.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00006.png
similarity index 100%
rename from tests/ragger/snapshots/flex/test_eip712_address_substitution/00006.png
rename to tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00006.png
diff --git a/tests/ragger/snapshots/flex/test_eip712_address_substitution_verbose/00000.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00000.png
similarity index 100%
rename from tests/ragger/snapshots/flex/test_eip712_address_substitution_verbose/00000.png
rename to tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00000.png
diff --git a/tests/ragger/snapshots/flex/test_eip712_address_substitution_verbose/00001.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00001.png
similarity index 100%
rename from tests/ragger/snapshots/flex/test_eip712_address_substitution_verbose/00001.png
rename to tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00001.png
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00002.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00002.png
new file mode 100644
index 0000000..fcd385e
Binary files /dev/null and b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00002.png differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_address_substitution_verbose/00003.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00003.png
similarity index 100%
rename from tests/ragger/snapshots/flex/test_eip712_address_substitution_verbose/00003.png
rename to tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00003.png
diff --git a/tests/ragger/snapshots/flex/test_eip712_address_substitution_verbose/00004.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00004.png
similarity index 100%
rename from tests/ragger/snapshots/flex/test_eip712_address_substitution_verbose/00004.png
rename to tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00004.png
diff --git a/tests/ragger/snapshots/flex/test_eip712_address_substitution_verbose/00005.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00005.png
similarity index 100%
rename from tests/ragger/snapshots/flex/test_eip712_address_substitution_verbose/00005.png
rename to tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00005.png
diff --git a/tests/ragger/snapshots/flex/test_eip712_address_substitution_verbose/00006.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00006.png
similarity index 100%
rename from tests/ragger/snapshots/flex/test_eip712_address_substitution_verbose/00006.png
rename to tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00006.png
diff --git a/tests/ragger/snapshots/flex/test_eip712_address_substitution_verbose/00007.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00007.png
similarity index 100%
rename from tests/ragger/snapshots/flex/test_eip712_address_substitution_verbose/00007.png
rename to tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00007.png
diff --git a/tests/ragger/snapshots/flex/test_eip712_address_substitution_verbose/00008.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00008.png
similarity index 100%
rename from tests/ragger/snapshots/flex/test_eip712_address_substitution_verbose/00008.png
rename to tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00008.png
diff --git a/tests/ragger/snapshots/flex/test_eip712_address_substitution_verbose/00009.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00009.png
similarity index 100%
rename from tests/ragger/snapshots/flex/test_eip712_address_substitution_verbose/00009.png
rename to tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00009.png
diff --git a/tests/ragger/snapshots/flex/test_eip712_address_substitution_verbose/00010.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00010.png
similarity index 100%
rename from tests/ragger/snapshots/flex/test_eip712_address_substitution_verbose/00010.png
rename to tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00010.png
diff --git a/tests/ragger/snapshots/flex/test_eip712_address_substitution_verbose/00011.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00011.png
similarity index 100%
rename from tests/ragger/snapshots/flex/test_eip712_address_substitution_verbose/00011.png
rename to tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00011.png
diff --git a/tests/ragger/snapshots/flex/test_eip712_address_substitution_verbose/00012.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00012.png
similarity index 100%
rename from tests/ragger/snapshots/flex/test_eip712_address_substitution_verbose/00012.png
rename to tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00012.png
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_address_substitution/00001.png b/tests/ragger/snapshots/nanosp/test_eip712_address_substitution/00001.png
deleted file mode 100644
index 5ea6164..0000000
Binary files a/tests/ragger/snapshots/nanosp/test_eip712_address_substitution/00001.png and /dev/null differ
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_address_substitution/00002.png b/tests/ragger/snapshots/nanosp/test_eip712_address_substitution/00002.png
deleted file mode 100644
index e9adb7c..0000000
Binary files a/tests/ragger/snapshots/nanosp/test_eip712_address_substitution/00002.png and /dev/null differ
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_address_substitution/00004.png b/tests/ragger/snapshots/nanosp/test_eip712_address_substitution/00004.png
deleted file mode 100644
index 6983285..0000000
Binary files a/tests/ragger/snapshots/nanosp/test_eip712_address_substitution/00004.png and /dev/null differ
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_address_substitution_verbose/00002.png b/tests/ragger/snapshots/nanosp/test_eip712_address_substitution_verbose/00002.png
deleted file mode 100644
index 71834ce..0000000
Binary files a/tests/ragger/snapshots/nanosp/test_eip712_address_substitution_verbose/00002.png and /dev/null differ
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_address_substitution/00000.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering/00000.png
similarity index 100%
rename from tests/ragger/snapshots/nanosp/test_eip712_address_substitution/00000.png
rename to tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering/00000.png
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering/00001.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering/00001.png
new file mode 100644
index 0000000..02ab24d
Binary files /dev/null and b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering/00001.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering/00002.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering/00002.png
new file mode 100644
index 0000000..40d12d2
Binary files /dev/null and b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering/00002.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_address_substitution/00003.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering/00003.png
similarity index 100%
rename from tests/ragger/snapshots/nanosp/test_eip712_address_substitution/00003.png
rename to tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering/00003.png
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering/00004.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering/00004.png
new file mode 100644
index 0000000..b79b3d7
Binary files /dev/null and b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering/00004.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_address_substitution/00005.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering/00005.png
similarity index 100%
rename from tests/ragger/snapshots/nanosp/test_eip712_address_substitution/00005.png
rename to tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering/00005.png
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_address_substitution/00006.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering/00006.png
similarity index 100%
rename from tests/ragger/snapshots/nanosp/test_eip712_address_substitution/00006.png
rename to tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering/00006.png
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_address_substitution_verbose/00000.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00000.png
similarity index 100%
rename from tests/ragger/snapshots/nanosp/test_eip712_address_substitution_verbose/00000.png
rename to tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00000.png
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_address_substitution_verbose/00001.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00001.png
similarity index 100%
rename from tests/ragger/snapshots/nanosp/test_eip712_address_substitution_verbose/00001.png
rename to tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00001.png
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00002.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00002.png
new file mode 100644
index 0000000..27384cb
Binary files /dev/null and b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00002.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_address_substitution_verbose/00003.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00003.png
similarity index 100%
rename from tests/ragger/snapshots/nanosp/test_eip712_address_substitution_verbose/00003.png
rename to tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00003.png
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_address_substitution_verbose/00004.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00004.png
similarity index 100%
rename from tests/ragger/snapshots/nanosp/test_eip712_address_substitution_verbose/00004.png
rename to tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00004.png
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_address_substitution_verbose/00005.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00005.png
similarity index 100%
rename from tests/ragger/snapshots/nanosp/test_eip712_address_substitution_verbose/00005.png
rename to tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00005.png
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_address_substitution_verbose/00006.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00006.png
similarity index 100%
rename from tests/ragger/snapshots/nanosp/test_eip712_address_substitution_verbose/00006.png
rename to tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00006.png
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_address_substitution_verbose/00007.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00007.png
similarity index 100%
rename from tests/ragger/snapshots/nanosp/test_eip712_address_substitution_verbose/00007.png
rename to tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00007.png
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_address_substitution_verbose/00008.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00008.png
similarity index 100%
rename from tests/ragger/snapshots/nanosp/test_eip712_address_substitution_verbose/00008.png
rename to tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00008.png
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_address_substitution_verbose/00009.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00009.png
similarity index 100%
rename from tests/ragger/snapshots/nanosp/test_eip712_address_substitution_verbose/00009.png
rename to tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00009.png
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_address_substitution_verbose/00010.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00010.png
similarity index 100%
rename from tests/ragger/snapshots/nanosp/test_eip712_address_substitution_verbose/00010.png
rename to tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00010.png
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_address_substitution_verbose/00011.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00011.png
similarity index 100%
rename from tests/ragger/snapshots/nanosp/test_eip712_address_substitution_verbose/00011.png
rename to tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00011.png
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_address_substitution_verbose/00012.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00012.png
similarity index 100%
rename from tests/ragger/snapshots/nanosp/test_eip712_address_substitution_verbose/00012.png
rename to tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00012.png
diff --git a/tests/ragger/snapshots/nanox/test_eip712_address_substitution/00001.png b/tests/ragger/snapshots/nanox/test_eip712_address_substitution/00001.png
deleted file mode 100644
index 5ea6164..0000000
Binary files a/tests/ragger/snapshots/nanox/test_eip712_address_substitution/00001.png and /dev/null differ
diff --git a/tests/ragger/snapshots/nanox/test_eip712_address_substitution/00002.png b/tests/ragger/snapshots/nanox/test_eip712_address_substitution/00002.png
deleted file mode 100644
index e9adb7c..0000000
Binary files a/tests/ragger/snapshots/nanox/test_eip712_address_substitution/00002.png and /dev/null differ
diff --git a/tests/ragger/snapshots/nanox/test_eip712_address_substitution/00004.png b/tests/ragger/snapshots/nanox/test_eip712_address_substitution/00004.png
deleted file mode 100644
index 6983285..0000000
Binary files a/tests/ragger/snapshots/nanox/test_eip712_address_substitution/00004.png and /dev/null differ
diff --git a/tests/ragger/snapshots/nanox/test_eip712_address_substitution_verbose/00002.png b/tests/ragger/snapshots/nanox/test_eip712_address_substitution_verbose/00002.png
deleted file mode 100644
index 71834ce..0000000
Binary files a/tests/ragger/snapshots/nanox/test_eip712_address_substitution_verbose/00002.png and /dev/null differ
diff --git a/tests/ragger/snapshots/nanox/test_eip712_address_substitution/00000.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering/00000.png
similarity index 100%
rename from tests/ragger/snapshots/nanox/test_eip712_address_substitution/00000.png
rename to tests/ragger/snapshots/nanox/test_eip712_advanced_filtering/00000.png
diff --git a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering/00001.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering/00001.png
new file mode 100644
index 0000000..02ab24d
Binary files /dev/null and b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering/00001.png differ
diff --git a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering/00002.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering/00002.png
new file mode 100644
index 0000000..40d12d2
Binary files /dev/null and b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/test_eip712_address_substitution/00003.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering/00003.png
similarity index 100%
rename from tests/ragger/snapshots/nanox/test_eip712_address_substitution/00003.png
rename to tests/ragger/snapshots/nanox/test_eip712_advanced_filtering/00003.png
diff --git a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering/00004.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering/00004.png
new file mode 100644
index 0000000..b79b3d7
Binary files /dev/null and b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/test_eip712_address_substitution/00005.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering/00005.png
similarity index 100%
rename from tests/ragger/snapshots/nanox/test_eip712_address_substitution/00005.png
rename to tests/ragger/snapshots/nanox/test_eip712_advanced_filtering/00005.png
diff --git a/tests/ragger/snapshots/nanox/test_eip712_address_substitution/00006.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering/00006.png
similarity index 100%
rename from tests/ragger/snapshots/nanox/test_eip712_address_substitution/00006.png
rename to tests/ragger/snapshots/nanox/test_eip712_advanced_filtering/00006.png
diff --git a/tests/ragger/snapshots/nanox/test_eip712_address_substitution_verbose/00000.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00000.png
similarity index 100%
rename from tests/ragger/snapshots/nanox/test_eip712_address_substitution_verbose/00000.png
rename to tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00000.png
diff --git a/tests/ragger/snapshots/nanox/test_eip712_address_substitution_verbose/00001.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00001.png
similarity index 100%
rename from tests/ragger/snapshots/nanox/test_eip712_address_substitution_verbose/00001.png
rename to tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00001.png
diff --git a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00002.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00002.png
new file mode 100644
index 0000000..27384cb
Binary files /dev/null and b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/test_eip712_address_substitution_verbose/00003.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00003.png
similarity index 100%
rename from tests/ragger/snapshots/nanox/test_eip712_address_substitution_verbose/00003.png
rename to tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00003.png
diff --git a/tests/ragger/snapshots/nanox/test_eip712_address_substitution_verbose/00004.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00004.png
similarity index 100%
rename from tests/ragger/snapshots/nanox/test_eip712_address_substitution_verbose/00004.png
rename to tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00004.png
diff --git a/tests/ragger/snapshots/nanox/test_eip712_address_substitution_verbose/00005.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00005.png
similarity index 100%
rename from tests/ragger/snapshots/nanox/test_eip712_address_substitution_verbose/00005.png
rename to tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00005.png
diff --git a/tests/ragger/snapshots/nanox/test_eip712_address_substitution_verbose/00006.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00006.png
similarity index 100%
rename from tests/ragger/snapshots/nanox/test_eip712_address_substitution_verbose/00006.png
rename to tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00006.png
diff --git a/tests/ragger/snapshots/nanox/test_eip712_address_substitution_verbose/00007.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00007.png
similarity index 100%
rename from tests/ragger/snapshots/nanox/test_eip712_address_substitution_verbose/00007.png
rename to tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00007.png
diff --git a/tests/ragger/snapshots/nanox/test_eip712_address_substitution_verbose/00008.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00008.png
similarity index 100%
rename from tests/ragger/snapshots/nanox/test_eip712_address_substitution_verbose/00008.png
rename to tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00008.png
diff --git a/tests/ragger/snapshots/nanox/test_eip712_address_substitution_verbose/00009.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00009.png
similarity index 100%
rename from tests/ragger/snapshots/nanox/test_eip712_address_substitution_verbose/00009.png
rename to tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00009.png
diff --git a/tests/ragger/snapshots/nanox/test_eip712_address_substitution_verbose/00010.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00010.png
similarity index 100%
rename from tests/ragger/snapshots/nanox/test_eip712_address_substitution_verbose/00010.png
rename to tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00010.png
diff --git a/tests/ragger/snapshots/nanox/test_eip712_address_substitution_verbose/00011.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00011.png
similarity index 100%
rename from tests/ragger/snapshots/nanox/test_eip712_address_substitution_verbose/00011.png
rename to tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00011.png
diff --git a/tests/ragger/snapshots/nanox/test_eip712_address_substitution_verbose/00012.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00012.png
similarity index 100%
rename from tests/ragger/snapshots/nanox/test_eip712_address_substitution_verbose/00012.png
rename to tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00012.png
diff --git a/tests/ragger/snapshots/stax/test_eip712_address_substitution/00001.png b/tests/ragger/snapshots/stax/test_eip712_address_substitution/00001.png
deleted file mode 100644
index 77c86c8..0000000
Binary files a/tests/ragger/snapshots/stax/test_eip712_address_substitution/00001.png and /dev/null differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_address_substitution/00002.png b/tests/ragger/snapshots/stax/test_eip712_address_substitution/00002.png
deleted file mode 100644
index 58f1657..0000000
Binary files a/tests/ragger/snapshots/stax/test_eip712_address_substitution/00002.png and /dev/null differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_address_substitution/00004.png b/tests/ragger/snapshots/stax/test_eip712_address_substitution/00004.png
deleted file mode 100644
index c9dd0f2..0000000
Binary files a/tests/ragger/snapshots/stax/test_eip712_address_substitution/00004.png and /dev/null differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_address_substitution_verbose/00002.png b/tests/ragger/snapshots/stax/test_eip712_address_substitution_verbose/00002.png
deleted file mode 100644
index 8eeaf8b..0000000
Binary files a/tests/ragger/snapshots/stax/test_eip712_address_substitution_verbose/00002.png and /dev/null differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_address_substitution/00000.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00000.png
similarity index 100%
rename from tests/ragger/snapshots/stax/test_eip712_address_substitution/00000.png
rename to tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00000.png
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00001.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00001.png
new file mode 100644
index 0000000..09e7b60
Binary files /dev/null and b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00001.png differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00002.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00002.png
new file mode 100644
index 0000000..146f386
Binary files /dev/null and b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00002.png differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_address_substitution/00003.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00003.png
similarity index 100%
rename from tests/ragger/snapshots/stax/test_eip712_address_substitution/00003.png
rename to tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00003.png
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00004.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00004.png
new file mode 100644
index 0000000..f30df56
Binary files /dev/null and b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00004.png differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_address_substitution/00005.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00005.png
similarity index 100%
rename from tests/ragger/snapshots/stax/test_eip712_address_substitution/00005.png
rename to tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00005.png
diff --git a/tests/ragger/snapshots/stax/test_eip712_address_substitution/00006.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00006.png
similarity index 100%
rename from tests/ragger/snapshots/stax/test_eip712_address_substitution/00006.png
rename to tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00006.png
diff --git a/tests/ragger/snapshots/stax/test_eip712_address_substitution_verbose/00000.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00000.png
similarity index 100%
rename from tests/ragger/snapshots/stax/test_eip712_address_substitution_verbose/00000.png
rename to tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00000.png
diff --git a/tests/ragger/snapshots/stax/test_eip712_address_substitution_verbose/00001.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00001.png
similarity index 100%
rename from tests/ragger/snapshots/stax/test_eip712_address_substitution_verbose/00001.png
rename to tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00001.png
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00002.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00002.png
new file mode 100644
index 0000000..0bbc80f
Binary files /dev/null and b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00002.png differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_address_substitution_verbose/00003.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00003.png
similarity index 100%
rename from tests/ragger/snapshots/stax/test_eip712_address_substitution_verbose/00003.png
rename to tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00003.png
diff --git a/tests/ragger/snapshots/stax/test_eip712_address_substitution_verbose/00004.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00004.png
similarity index 100%
rename from tests/ragger/snapshots/stax/test_eip712_address_substitution_verbose/00004.png
rename to tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00004.png
diff --git a/tests/ragger/snapshots/stax/test_eip712_address_substitution_verbose/00005.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00005.png
similarity index 100%
rename from tests/ragger/snapshots/stax/test_eip712_address_substitution_verbose/00005.png
rename to tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00005.png
diff --git a/tests/ragger/snapshots/stax/test_eip712_address_substitution_verbose/00006.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00006.png
similarity index 100%
rename from tests/ragger/snapshots/stax/test_eip712_address_substitution_verbose/00006.png
rename to tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00006.png
diff --git a/tests/ragger/snapshots/stax/test_eip712_address_substitution_verbose/00007.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00007.png
similarity index 100%
rename from tests/ragger/snapshots/stax/test_eip712_address_substitution_verbose/00007.png
rename to tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00007.png
diff --git a/tests/ragger/snapshots/stax/test_eip712_address_substitution_verbose/00008.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00008.png
similarity index 100%
rename from tests/ragger/snapshots/stax/test_eip712_address_substitution_verbose/00008.png
rename to tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00008.png
diff --git a/tests/ragger/snapshots/stax/test_eip712_address_substitution_verbose/00009.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00009.png
similarity index 100%
rename from tests/ragger/snapshots/stax/test_eip712_address_substitution_verbose/00009.png
rename to tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00009.png
diff --git a/tests/ragger/snapshots/stax/test_eip712_address_substitution_verbose/00010.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00010.png
similarity index 100%
rename from tests/ragger/snapshots/stax/test_eip712_address_substitution_verbose/00010.png
rename to tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00010.png
diff --git a/tests/ragger/snapshots/stax/test_eip712_address_substitution_verbose/00011.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00011.png
similarity index 100%
rename from tests/ragger/snapshots/stax/test_eip712_address_substitution_verbose/00011.png
rename to tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00011.png
diff --git a/tests/ragger/snapshots/stax/test_eip712_address_substitution_verbose/00012.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00012.png
similarity index 100%
rename from tests/ragger/snapshots/stax/test_eip712_address_substitution_verbose/00012.png
rename to tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00012.png
diff --git a/tests/ragger/test_eip712.py b/tests/ragger/test_eip712.py
index 6059740..74a1233 100644
--- a/tests/ragger/test_eip712.py
+++ b/tests/ragger/test_eip712.py
@@ -180,12 +180,12 @@ def test_eip712_new(firmware: Firmware,
     assert recovered_addr == get_wallet_addr(app_client)
 
 
-def test_eip712_address_substitution(firmware: Firmware,
-                                     backend: BackendInterface,
-                                     navigator: Navigator,
-                                     default_screenshot_path: Path,
-                                     test_name: str,
-                                     verbose: bool):
+def test_eip712_advanced_filtering(firmware: Firmware,
+                                   backend: BackendInterface,
+                                   navigator: Navigator,
+                                   default_screenshot_path: Path,
+                                   test_name: str,
+                                   verbose: bool):
     global SNAPS_CONFIG
 
     app_client = EthAppClient(backend)
@@ -195,25 +195,43 @@ def test_eip712_address_substitution(firmware: Firmware,
     if verbose:
         test_name += "_verbose"
     SNAPS_CONFIG = SnapshotsConfig(test_name)
-    with open(f"{eip712_json_path()}/address_substitution.json", encoding="utf-8") as file:
-        data = json.load(file)
 
-    app_client.provide_token_metadata("DAI",
-                                      bytes.fromhex(data["message"]["token"][2:]),
-                                      18,
-                                      1)
-
-    challenge = ResponseParser.challenge(app_client.get_challenge().data)
-    app_client.provide_domain_name(challenge,
-                                   "vitalik.eth",
-                                   bytes.fromhex(data["message"]["to"][2:]))
+    data = {
+        "domain": {
+            "chainId": 1,
+            "name": "Advanced test",
+            "verifyingContract": "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC",
+            "version": "1"
+        },
+        "message": {
+            "from": "0xaAaAaAaaAaAaAaaAaAAAAAAAAaaaAaAaAaaAaaAa",
+            "to": "0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045",
+            "amount": 117,
+            "token": "0x6B175474E89094C44Da98b954EedeAC495271d0F"
+        },
+        "primaryType": "Transfer",
+        "types": {
+            "EIP712Domain": [
+                {"name": "name", "type": "string"},
+                {"name": "version", "type": "string"},
+                {"name": "chainId", "type": "uint256"},
+                {"name": "verifyingContract", "type": "address"}
+            ],
+            "Transfer": [
+                {"name": "from", "type": "address"},
+                {"name": "to", "type": "address"},
+                {"name": "amount", "type": "uint256"},
+                {"name": "token", "type": "address"}
+            ]
+        }
+    }
 
     if verbose:
         settings_toggle(firmware, navigator, [SettingID.VERBOSE_EIP712])
         filters = None
     else:
         filters = {
-            "name": "Token test",
+            "name": "Advanced Filtering",
             "fields": {
                 "amount": "Amount",
                 "token": "Token",