diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00000.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_permit/00000.png
similarity index 100%
rename from tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00000.png
rename to tests/ragger/snapshots/flex/test_eip712_advanced_filtering_permit/00000.png
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_permit/00001.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_permit/00001.png
new file mode 100644
index 000000000..3728f5fc2
Binary files /dev/null and b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_permit/00001.png differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_permit/00002.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_permit/00002.png
new file mode 100644
index 000000000..73679b017
Binary files /dev/null and b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_permit/00002.png differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_permit/00003.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_permit/00003.png
new file mode 100644
index 000000000..fc3095f46
Binary files /dev/null and b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_permit/00003.png differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00013.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_permit/00004.png
similarity index 100%
rename from tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00013.png
rename to tests/ragger/snapshots/flex/test_eip712_advanced_filtering_permit/00004.png
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00014.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_permit/00005.png
similarity index 100%
rename from tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00014.png
rename to tests/ragger/snapshots/flex/test_eip712_advanced_filtering_permit/00005.png
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00001.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00001.png
deleted file mode 100644
index 96525be1b..000000000
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00001.png and /dev/null differ
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
deleted file mode 100644
index fcd385eef..000000000
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00002.png and /dev/null differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00003.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00003.png
deleted file mode 100644
index 24e709709..000000000
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00003.png and /dev/null differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00004.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00004.png
deleted file mode 100644
index d7f125ee9..000000000
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00004.png and /dev/null differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00005.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00005.png
deleted file mode 100644
index 39cd55838..000000000
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00005.png and /dev/null differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00006.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00006.png
deleted file mode 100644
index 5af63c121..000000000
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00006.png and /dev/null differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00007.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00007.png
deleted file mode 100644
index d8be8494b..000000000
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00007.png and /dev/null differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00008.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00008.png
deleted file mode 100644
index fe777571f..000000000
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00008.png and /dev/null differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00009.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00009.png
deleted file mode 100644
index 97fe3ffab..000000000
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00009.png and /dev/null differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00010.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00010.png
deleted file mode 100644
index e1e50fd4e..000000000
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00010.png and /dev/null differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00011.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00011.png
deleted file mode 100644
index 462b9d606..000000000
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00011.png and /dev/null differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00012.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00012.png
deleted file mode 100644
index 1fe5517f0..000000000
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00012.png and /dev/null differ
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00000.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_permit/00000.png
similarity index 100%
rename from tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00000.png
rename to tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_permit/00000.png
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_permit/00001.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_permit/00001.png
new file mode 100644
index 000000000..bf2b3e7c5
Binary files /dev/null and b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_permit/00001.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_permit/00002.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_permit/00002.png
new file mode 100644
index 000000000..1dfaf83c4
Binary files /dev/null and b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_permit/00002.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_permit/00003.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_permit/00003.png
new file mode 100644
index 000000000..26d4d8494
Binary files /dev/null and b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_permit/00003.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00013.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_permit/00004.png
similarity index 100%
rename from tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00013.png
rename to tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_permit/00004.png
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00014.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_permit/00005.png
similarity index 100%
rename from tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00014.png
rename to tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_permit/00005.png
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00001.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00001.png
deleted file mode 100644
index 7f1fe8adc..000000000
Binary files a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00001.png and /dev/null differ
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
deleted file mode 100644
index 27384cb8b..000000000
Binary files a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00002.png and /dev/null differ
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00003.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00003.png
deleted file mode 100644
index 25bfb0686..000000000
Binary files a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00003.png and /dev/null differ
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00004.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00004.png
deleted file mode 100644
index a4619ff2c..000000000
Binary files a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00004.png and /dev/null differ
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00005.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00005.png
deleted file mode 100644
index bb49e6dab..000000000
Binary files a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00005.png and /dev/null differ
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00006.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00006.png
deleted file mode 100644
index b9d7e1524..000000000
Binary files a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00006.png and /dev/null differ
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00007.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00007.png
deleted file mode 100644
index 17f59fdc1..000000000
Binary files a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00007.png and /dev/null differ
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00008.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00008.png
deleted file mode 100644
index b8ab0408b..000000000
Binary files a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00008.png and /dev/null differ
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00009.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00009.png
deleted file mode 100644
index 2f7c57461..000000000
Binary files a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00009.png and /dev/null differ
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00010.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00010.png
deleted file mode 100644
index 1415c1270..000000000
Binary files a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00010.png and /dev/null differ
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00011.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00011.png
deleted file mode 100644
index 6a53a258e..000000000
Binary files a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00011.png and /dev/null differ
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00012.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00012.png
deleted file mode 100644
index b465a2085..000000000
Binary files a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00012.png and /dev/null differ
diff --git a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00000.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_permit/00000.png
similarity index 100%
rename from tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00000.png
rename to tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_permit/00000.png
diff --git a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_permit/00001.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_permit/00001.png
new file mode 100644
index 000000000..bf2b3e7c5
Binary files /dev/null and b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_permit/00001.png differ
diff --git a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_permit/00002.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_permit/00002.png
new file mode 100644
index 000000000..1dfaf83c4
Binary files /dev/null and b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_permit/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_permit/00003.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_permit/00003.png
new file mode 100644
index 000000000..26d4d8494
Binary files /dev/null and b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_permit/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00013.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_permit/00004.png
similarity index 100%
rename from tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00013.png
rename to tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_permit/00004.png
diff --git a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00014.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_permit/00005.png
similarity index 100%
rename from tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00014.png
rename to tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_permit/00005.png
diff --git a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00001.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00001.png
deleted file mode 100644
index 7f1fe8adc..000000000
Binary files a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00001.png and /dev/null differ
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
deleted file mode 100644
index 27384cb8b..000000000
Binary files a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00002.png and /dev/null differ
diff --git a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00003.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00003.png
deleted file mode 100644
index 25bfb0686..000000000
Binary files a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00003.png and /dev/null differ
diff --git a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00004.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00004.png
deleted file mode 100644
index a4619ff2c..000000000
Binary files a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00004.png and /dev/null differ
diff --git a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00005.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00005.png
deleted file mode 100644
index bb49e6dab..000000000
Binary files a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00005.png and /dev/null differ
diff --git a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00006.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00006.png
deleted file mode 100644
index b9d7e1524..000000000
Binary files a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00006.png and /dev/null differ
diff --git a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00007.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00007.png
deleted file mode 100644
index 17f59fdc1..000000000
Binary files a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00007.png and /dev/null differ
diff --git a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00008.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00008.png
deleted file mode 100644
index b8ab0408b..000000000
Binary files a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00008.png and /dev/null differ
diff --git a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00009.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00009.png
deleted file mode 100644
index 2f7c57461..000000000
Binary files a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00009.png and /dev/null differ
diff --git a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00010.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00010.png
deleted file mode 100644
index 1415c1270..000000000
Binary files a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00010.png and /dev/null differ
diff --git a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00011.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00011.png
deleted file mode 100644
index 6a53a258e..000000000
Binary files a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00011.png and /dev/null differ
diff --git a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00012.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00012.png
deleted file mode 100644
index b465a2085..000000000
Binary files a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00012.png and /dev/null differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00000.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_permit/00000.png
similarity index 100%
rename from tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00000.png
rename to tests/ragger/snapshots/stax/test_eip712_advanced_filtering_permit/00000.png
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_permit/00001.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_permit/00001.png
new file mode 100644
index 000000000..96b35ad68
Binary files /dev/null and b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_permit/00001.png differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_permit/00002.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_permit/00002.png
new file mode 100644
index 000000000..6bf91491c
Binary files /dev/null and b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_permit/00002.png differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_permit/00003.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_permit/00003.png
new file mode 100644
index 000000000..187512a78
Binary files /dev/null and b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_permit/00003.png differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00013.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_permit/00004.png
similarity index 100%
rename from tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00013.png
rename to tests/ragger/snapshots/stax/test_eip712_advanced_filtering_permit/00004.png
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00014.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_permit/00005.png
similarity index 100%
rename from tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00014.png
rename to tests/ragger/snapshots/stax/test_eip712_advanced_filtering_permit/00005.png
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00001.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00001.png
deleted file mode 100644
index 40cc0991c..000000000
Binary files a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00001.png and /dev/null differ
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
deleted file mode 100644
index 0bbc80f43..000000000
Binary files a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00002.png and /dev/null differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00003.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00003.png
deleted file mode 100644
index 7339e257e..000000000
Binary files a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00003.png and /dev/null differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00004.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00004.png
deleted file mode 100644
index c367eb6db..000000000
Binary files a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00004.png and /dev/null differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00005.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00005.png
deleted file mode 100644
index 43a6b68d6..000000000
Binary files a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00005.png and /dev/null differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00006.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00006.png
deleted file mode 100644
index 06031a765..000000000
Binary files a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00006.png and /dev/null differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00007.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00007.png
deleted file mode 100644
index 669fb2f7e..000000000
Binary files a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00007.png and /dev/null differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00008.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00008.png
deleted file mode 100644
index fea8a2975..000000000
Binary files a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00008.png and /dev/null differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00009.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00009.png
deleted file mode 100644
index beaa1ad5f..000000000
Binary files a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00009.png and /dev/null differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00010.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00010.png
deleted file mode 100644
index 71d64db7c..000000000
Binary files a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00010.png and /dev/null differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00011.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00011.png
deleted file mode 100644
index e9f9b9230..000000000
Binary files a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00011.png and /dev/null differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00012.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00012.png
deleted file mode 100644
index 23d3c525a..000000000
Binary files a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00012.png and /dev/null differ
diff --git a/tests/ragger/test_eip712.py b/tests/ragger/test_eip712.py
index c293e3b69..91502f764 100644
--- a/tests/ragger/test_eip712.py
+++ b/tests/ragger/test_eip712.py
@@ -180,61 +180,53 @@ def test_eip712_new(firmware: Firmware,
     assert recovered_addr == get_wallet_addr(app_client)
 
 
-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)
-    if firmware.device == "nanos":
-        pytest.skip("Not supported on LNS")
-
-    if verbose:
-        test_name += "_verbose"
-    SNAPS_CONFIG = SnapshotsConfig(test_name)
-
-    data = {
-        "domain": {
-            "chainId": 1,
-            "name": "Advanced test",
-            "verifyingContract": "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC",
-            "version": "1"
-        },
-        "message": {
-            "with": "0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045",
-            "value_recv": 10000000000000000,
-            "token_send": "0x6B175474E89094C44Da98b954EedeAC495271d0F",
-            "value_send": 24500000000000000000,
-            "token_recv": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "expires": 1714559400,
+class DataSet():
+    data: dict
+    filters: dict
+    suffix: str
+
+    def __init__(self, data: dict, filters: dict, suffix: str = ""):
+        self.data = data
+        self.filters = filters
+        self.suffix = suffix
+
+
+ADVANCED_DATA_SETS = [
+    DataSet(
+        {
+            "domain": {
+                "chainId": 1,
+                "name": "Advanced test",
+                "verifyingContract": "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC",
+                "version": "1"
+            },
+            "message": {
+                "with": "0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045",
+                "value_recv": 10000000000000000,
+                "token_send": "0x6B175474E89094C44Da98b954EedeAC495271d0F",
+                "value_send": 24500000000000000000,
+                "token_recv": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
+                "expires": 1714559400,
+            },
+            "primaryType": "Transfer",
+            "types": {
+                "EIP712Domain": [
+                    {"name": "name", "type": "string"},
+                    {"name": "version", "type": "string"},
+                    {"name": "chainId", "type": "uint256"},
+                    {"name": "verifyingContract", "type": "address"}
+                ],
+                "Transfer": [
+                    {"name": "with", "type": "address"},
+                    {"name": "value_recv", "type": "uint256"},
+                    {"name": "token_send", "type": "address"},
+                    {"name": "value_send", "type": "uint256"},
+                    {"name": "token_recv", "type": "address"},
+                    {"name": "expires", "type": "uint64"},
+                ]
+            }
         },
-        "primaryType": "Transfer",
-        "types": {
-            "EIP712Domain": [
-                {"name": "name", "type": "string"},
-                {"name": "version", "type": "string"},
-                {"name": "chainId", "type": "uint256"},
-                {"name": "verifyingContract", "type": "address"}
-            ],
-            "Transfer": [
-                {"name": "with", "type": "address"},
-                {"name": "value_recv", "type": "uint256"},
-                {"name": "token_send", "type": "address"},
-                {"name": "value_send", "type": "uint256"},
-                {"name": "token_recv", "type": "address"},
-                {"name": "expires", "type": "uint64"},
-            ]
-        }
-    }
-
-    if verbose:
-        settings_toggle(firmware, navigator, [SettingID.VERBOSE_EIP712])
-        filters = None
-    else:
-        filters = {
+        {
             "name": "Advanced Filtering",
             "tokens": [
                 {
@@ -279,15 +271,92 @@ def test_eip712_advanced_filtering(firmware: Firmware,
                 },
             }
         }
+    ),
+    DataSet(
+        {
+            "types": {
+                "EIP712Domain": [
+                    {"name": "name", "type": "string"},
+                    {"name": "version", "type": "string"},
+                    {"name": "chainId", "type": "uint256"},
+                    {"name": "verifyingContract", "type": "address"},
+                ],
+                "Permit": [
+                    {"name": "owner", "type": "address"},
+                    {"name": "spender", "type": "address"},
+                    {"name": "value", "type": "uint256"},
+                    {"name": "nonce", "type": "uint256"},
+                    {"name": "deadline", "type": "uint256"},
+                ]
+            },
+            "primaryType": "Permit",
+            "domain": {
+                "name": "ENS",
+                "version": "1",
+                "verifyingContract": "0xC18360217D8F7Ab5e7c516566761Ea12Ce7F9D72",
+                "chainId": 1,
+            },
+            "message": {
+                "owner": "0xb5a6948372defdfc5754b69dc831d21e2d5ebd74",
+                "spender": "0x5B38Da6a701c568545dCfcB03FcB875f56beddC4",
+                "value": 4200000000000000000,
+                "nonce": 0,
+                "deadline": 1719756000,
+            }
+        },
+        {
+            "name": "Permit filtering",
+            "tokens": [
+                {
+                    "addr": "0xC18360217D8F7Ab5e7c516566761Ea12Ce7F9D72",
+                    "ticker": "ENS",
+                    "decimals": 18,
+                    "chain_id": 1,
+                },
+            ],
+            "fields": {
+                "value": {
+                    "type": "amount_join_value",
+                    "name": "Send",
+                },
+                "deadline": {
+                    "type": "datetime",
+                    "name": "Deadline",
+                },
+            }
+        },
+        "_permit"
+    ),
+]
+
+
+@pytest.fixture(name="data_set", params=ADVANCED_DATA_SETS)
+def data_set_fixture(request) -> DataSet:
+    return request.param
+
+
+def test_eip712_advanced_filtering(firmware: Firmware,
+                                   backend: BackendInterface,
+                                   navigator: Navigator,
+                                   default_screenshot_path: Path,
+                                   test_name: str,
+                                   data_set: DataSet):
+    global SNAPS_CONFIG
+
+    app_client = EthAppClient(backend)
+    if firmware.device == "nanos":
+        pytest.skip("Not supported on LNS")
+
+    SNAPS_CONFIG = SnapshotsConfig(test_name + data_set.suffix)
 
     vrs = eip712_new_common(firmware,
                             navigator,
                             default_screenshot_path,
                             app_client,
-                            data,
-                            filters,
-                            verbose)
+                            data_set.data,
+                            data_set.filters,
+                            False)
 
     # verify signature
-    addr = recover_message(data, vrs)
+    addr = recover_message(data_set.data, vrs)
     assert addr == get_wallet_addr(app_client)