diff --git a/slither/solc_parsing/declarations/modifier.py b/slither/solc_parsing/declarations/modifier.py
index 3fdc22d4e8..a3f07da7f5 100644
--- a/slither/solc_parsing/declarations/modifier.py
+++ b/slither/solc_parsing/declarations/modifier.py
@@ -62,7 +62,7 @@ def analyze_content(self):
         self._content_was_analyzed = True
 
         if self.is_compact_ast:
-            body = self._functionNotParsed["body"]
+            body = self._functionNotParsed.get("body", None)
 
             if body and body[self.get_key()] == "Block":
                 self._function.is_implemented = True
diff --git a/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.0-compact.zip b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.0-compact.zip
new file mode 100644
index 0000000000..eab87a486f
Binary files /dev/null and b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.0-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.0-legacy.zip b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.0-legacy.zip
new file mode 100644
index 0000000000..b5946691df
Binary files /dev/null and b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.0-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.1-compact.zip b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.1-compact.zip
new file mode 100644
index 0000000000..3d960b6b49
Binary files /dev/null and b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.1-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.1-legacy.zip b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.1-legacy.zip
new file mode 100644
index 0000000000..c19cda4795
Binary files /dev/null and b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.1-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.2-compact.zip b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.2-compact.zip
new file mode 100644
index 0000000000..065df29b34
Binary files /dev/null and b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.2-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.2-legacy.zip b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.2-legacy.zip
new file mode 100644
index 0000000000..4f749c9ca9
Binary files /dev/null and b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.2-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.3-compact.zip b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.3-compact.zip
new file mode 100644
index 0000000000..24b6863ae4
Binary files /dev/null and b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.3-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.3-legacy.zip b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.3-legacy.zip
new file mode 100644
index 0000000000..ed1aec78b9
Binary files /dev/null and b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.3-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.4-compact.zip b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.4-compact.zip
new file mode 100644
index 0000000000..bcd70d56af
Binary files /dev/null and b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.4-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.4-legacy.zip b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.4-legacy.zip
new file mode 100644
index 0000000000..4eaa1a25ea
Binary files /dev/null and b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.4-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.5-compact.zip b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.5-compact.zip
new file mode 100644
index 0000000000..1e5f938ad0
Binary files /dev/null and b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.5-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.5-legacy.zip b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.5-legacy.zip
new file mode 100644
index 0000000000..daa91f7bf7
Binary files /dev/null and b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.5-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.6-compact.zip b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.6-compact.zip
new file mode 100644
index 0000000000..c69f3f4267
Binary files /dev/null and b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.6-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.6-legacy.zip b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.6-legacy.zip
new file mode 100644
index 0000000000..db8047403a
Binary files /dev/null and b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.7.6-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.0-compact.zip b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.0-compact.zip
new file mode 100644
index 0000000000..9d472762d8
Binary files /dev/null and b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.0-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.1-compact.zip b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.1-compact.zip
new file mode 100644
index 0000000000..1aafa0cbec
Binary files /dev/null and b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.1-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.10-compact.zip b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.10-compact.zip
new file mode 100644
index 0000000000..70882f214a
Binary files /dev/null and b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.10-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.11-compact.zip b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.11-compact.zip
new file mode 100644
index 0000000000..94bc29af8d
Binary files /dev/null and b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.11-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.12-compact.zip b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.12-compact.zip
new file mode 100644
index 0000000000..ffa634d552
Binary files /dev/null and b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.12-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.13-compact.zip b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.13-compact.zip
new file mode 100644
index 0000000000..c56bc86aad
Binary files /dev/null and b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.13-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.14-compact.zip b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.14-compact.zip
new file mode 100644
index 0000000000..d833db7923
Binary files /dev/null and b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.14-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.15-compact.zip b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.15-compact.zip
new file mode 100644
index 0000000000..466a99699d
Binary files /dev/null and b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.15-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.2-compact.zip b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.2-compact.zip
new file mode 100644
index 0000000000..59e68af7ae
Binary files /dev/null and b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.2-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.3-compact.zip b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.3-compact.zip
new file mode 100644
index 0000000000..f477ad171f
Binary files /dev/null and b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.3-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.4-compact.zip b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.4-compact.zip
new file mode 100644
index 0000000000..721779db17
Binary files /dev/null and b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.4-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.5-compact.zip b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.5-compact.zip
new file mode 100644
index 0000000000..5bafac6b99
Binary files /dev/null and b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.5-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.6-compact.zip b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.6-compact.zip
new file mode 100644
index 0000000000..e0358444c0
Binary files /dev/null and b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.6-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.7-compact.zip b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.7-compact.zip
new file mode 100644
index 0000000000..f9d8875462
Binary files /dev/null and b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.7-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.8-compact.zip b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.8-compact.zip
new file mode 100644
index 0000000000..ddcc81093f
Binary files /dev/null and b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.8-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.9-compact.zip b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.9-compact.zip
new file mode 100644
index 0000000000..ebd1e7f232
Binary files /dev/null and b/tests/ast-parsing/compile/modifier-0.7.0.sol-0.8.9-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.0-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.0-compact.zip
index cfddc0391c..c6e39a8f04 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.0-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.0-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.0-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.0-legacy.zip
index 39d95cfe68..512e114a10 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.0-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.0-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.1-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.1-compact.zip
index 69a7a8fe44..38729e0767 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.1-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.1-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.1-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.1-legacy.zip
index 26988bdc62..46a1a7d69d 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.1-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.1-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.10-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.10-compact.zip
index c816e1db57..16f0e36945 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.10-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.10-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.10-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.10-legacy.zip
index c816e1db57..16f0e36945 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.10-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.10-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.11-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.11-compact.zip
index eb7c8fe708..9eb504d535 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.11-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.11-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.11-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.11-legacy.zip
index eb7c8fe708..9eb504d535 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.11-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.11-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.12-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.12-compact.zip
index 18b5c0023e..bda6fe0e3a 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.12-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.12-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.12-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.12-legacy.zip
index 18b5c0023e..bda6fe0e3a 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.12-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.12-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.13-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.13-compact.zip
index 05e511d791..d0d1837168 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.13-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.13-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.13-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.13-legacy.zip
index 4f1ca3c926..579d9f6d01 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.13-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.13-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.14-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.14-compact.zip
index db0a0f3fd7..ff506a0077 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.14-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.14-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.14-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.14-legacy.zip
index d42f602b7d..61a37cac32 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.14-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.14-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.15-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.15-compact.zip
index 0483a7aab8..062329dc3d 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.15-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.15-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.15-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.15-legacy.zip
index 547e3a7fd8..148b2f868e 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.15-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.15-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.16-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.16-compact.zip
index 017670d1c7..1259e4e03c 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.16-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.16-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.16-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.16-legacy.zip
index 07ae0f8bee..97c4f577c5 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.16-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.16-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.17-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.17-compact.zip
index 66e5c99573..2106dc2cbf 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.17-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.17-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.17-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.17-legacy.zip
index 44bda80fa3..c7c6c92cbb 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.17-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.17-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.18-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.18-compact.zip
index 025fafec49..8dcf47e250 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.18-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.18-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.18-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.18-legacy.zip
index 2900f1013c..8c756b719a 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.18-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.18-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.19-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.19-compact.zip
index b141c15d68..b90f8c07e6 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.19-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.19-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.19-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.19-legacy.zip
index 7f575de73a..8c8fbab7d5 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.19-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.19-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.2-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.2-compact.zip
index 8bc67d8777..61e6168577 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.2-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.2-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.2-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.2-legacy.zip
index 7c3aed1344..d5d0691db0 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.2-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.2-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.20-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.20-compact.zip
index 9ad17df8c3..7dbfd796bb 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.20-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.20-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.20-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.20-legacy.zip
index 35c6a07577..f2f57278ff 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.20-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.20-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.21-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.21-compact.zip
index 1ed1491e8a..620bceadb9 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.21-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.21-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.21-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.21-legacy.zip
index 739750ff45..bbe5db5a42 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.21-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.21-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.22-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.22-compact.zip
index 4b148ba569..6d0ac5e340 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.22-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.22-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.22-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.22-legacy.zip
index c2be37ba95..ecf80602fe 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.22-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.22-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.23-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.23-compact.zip
index 19c1a42936..a7b910323b 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.23-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.23-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.23-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.23-legacy.zip
index fe5195a084..ba20503209 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.23-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.23-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.24-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.24-compact.zip
index 3760c5f0b3..1222d8d8d9 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.24-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.24-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.24-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.24-legacy.zip
index 25d4442ea4..873ee11fe6 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.24-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.24-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.25-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.25-compact.zip
index f66a17d9a6..c1b054e2ee 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.25-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.25-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.25-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.25-legacy.zip
index fc9d9d792b..cb8cfb0643 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.25-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.25-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.26-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.26-compact.zip
index d46b4535b6..33c4637d44 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.26-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.26-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.26-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.26-legacy.zip
index 167c10fb14..426d2c8c41 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.26-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.26-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.3-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.3-compact.zip
index b19bf3a396..a1086e5082 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.3-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.3-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.3-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.3-legacy.zip
index 14e02b8c25..66a2c1e660 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.3-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.3-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.4-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.4-compact.zip
index 842c67c65e..ca622d7f74 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.4-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.4-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.4-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.4-legacy.zip
index 560ee388bf..380b08cfca 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.4-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.4-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.5-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.5-compact.zip
index 44f3dac3fe..f19c5297da 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.5-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.5-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.5-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.5-legacy.zip
index 6c909e4f2d..0c3808e7fb 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.5-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.5-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.6-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.6-compact.zip
index f4407df851..ca3a1023fb 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.6-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.6-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.6-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.6-legacy.zip
index 8164be9690..886617fd85 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.6-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.6-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.7-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.7-compact.zip
index 6f439ed9e5..081953928b 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.7-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.7-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.7-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.7-legacy.zip
index ed1708f042..f5374b523c 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.7-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.7-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.8-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.8-compact.zip
index 46807909d5..ad369947e9 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.8-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.8-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.8-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.8-legacy.zip
index f90a3f74b8..91de2e82a3 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.8-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.8-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.9-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.9-compact.zip
index b735fe4190..2646618afc 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.9-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.9-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.4.9-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.4.9-legacy.zip
index b735fe4190..2646618afc 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.4.9-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.4.9-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.5.0-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.5.0-compact.zip
index 75023f81ac..e4ba62b565 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.5.0-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.5.0-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.5.0-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.5.0-legacy.zip
index da4e7d59a1..37484452a7 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.5.0-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.5.0-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.5.1-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.5.1-compact.zip
index 54dbdf88e9..87ea809a4d 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.5.1-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.5.1-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.5.1-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.5.1-legacy.zip
index 5b2633e0e0..af5d001c3f 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.5.1-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.5.1-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.5.10-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.5.10-compact.zip
index 22c051ae9d..77d916a4b0 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.5.10-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.5.10-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.5.10-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.5.10-legacy.zip
index ee2390a863..0841d56583 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.5.10-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.5.10-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.5.11-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.5.11-compact.zip
index 97cb594793..d032f2b7a4 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.5.11-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.5.11-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.5.11-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.5.11-legacy.zip
index a7ce558d9b..0d335e7342 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.5.11-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.5.11-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.5.12-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.5.12-compact.zip
index 20896d7d44..5be1743028 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.5.12-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.5.12-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.5.12-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.5.12-legacy.zip
index 5ce65aeb8a..8cab71b126 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.5.12-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.5.12-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.5.13-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.5.13-compact.zip
index 484e9fd8d2..8d47c01baf 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.5.13-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.5.13-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.5.13-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.5.13-legacy.zip
index e3bbd21f12..9d238eedd8 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.5.13-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.5.13-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.5.14-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.5.14-compact.zip
index 10bbc7d75e..ce2f2fee06 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.5.14-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.5.14-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.5.14-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.5.14-legacy.zip
index d0125916c7..a19d279576 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.5.14-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.5.14-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.5.15-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.5.15-compact.zip
index 263785eb56..1cdc76aa58 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.5.15-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.5.15-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.5.15-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.5.15-legacy.zip
index 27f726f89c..1bb72e452d 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.5.15-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.5.15-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.5.16-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.5.16-compact.zip
index 9dba82dfea..d1b0b62b73 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.5.16-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.5.16-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.5.16-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.5.16-legacy.zip
index 7d72a38b30..689a5c5373 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.5.16-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.5.16-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.5.17-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.5.17-compact.zip
index ef73090bc2..ff7a96a213 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.5.17-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.5.17-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.5.17-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.5.17-legacy.zip
index 1c741923ac..5ac31105d8 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.5.17-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.5.17-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.5.2-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.5.2-compact.zip
index 74816482ed..f7ab71d36d 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.5.2-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.5.2-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.5.2-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.5.2-legacy.zip
index 05bd06b7c2..edd73a4f2b 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.5.2-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.5.2-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.5.3-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.5.3-compact.zip
index 11a20496d9..adc49dd65a 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.5.3-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.5.3-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.5.3-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.5.3-legacy.zip
index 057444fbd9..2d796d9d25 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.5.3-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.5.3-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.5.4-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.5.4-compact.zip
index a54f0cb100..9e67e1ca46 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.5.4-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.5.4-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.5.4-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.5.4-legacy.zip
index 999da3b118..b3155aa1e7 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.5.4-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.5.4-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.5.5-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.5.5-compact.zip
index 8ed2115361..161c2c949a 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.5.5-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.5.5-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.5.5-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.5.5-legacy.zip
index e59d05a611..a48e14e831 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.5.5-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.5.5-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.5.6-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.5.6-compact.zip
index 5a58463bfd..ab38ddb1be 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.5.6-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.5.6-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.5.6-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.5.6-legacy.zip
index 83de17a296..859da901f2 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.5.6-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.5.6-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.5.7-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.5.7-compact.zip
index 7614bb79eb..6c6c20763d 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.5.7-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.5.7-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.5.7-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.5.7-legacy.zip
index 987af0e381..766b7c3ce7 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.5.7-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.5.7-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.5.8-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.5.8-compact.zip
index 7cf133ae4a..71684668df 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.5.8-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.5.8-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.5.8-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.5.8-legacy.zip
index 241d8b4454..81f0cf7bcd 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.5.8-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.5.8-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.5.9-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.5.9-compact.zip
index c57077d1d4..1bf4d20c76 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.5.9-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.5.9-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.5.9-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.5.9-legacy.zip
index ea69f7fbf4..a0b755b690 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.5.9-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.5.9-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.6.0-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.6.0-compact.zip
index 2decd51e2f..ef09219463 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.6.0-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.6.0-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.6.0-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.6.0-legacy.zip
index d4ed5b8d15..8cc3597bbd 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.6.0-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.6.0-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.6.1-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.6.1-compact.zip
index a0b337bc66..0eb1ab76c0 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.6.1-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.6.1-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.6.1-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.6.1-legacy.zip
index 50513f8a19..fe374bfc80 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.6.1-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.6.1-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.6.10-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.6.10-compact.zip
index 12fcd38934..a3242275a9 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.6.10-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.6.10-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.6.10-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.6.10-legacy.zip
index 99ec8d2046..0d32b92955 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.6.10-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.6.10-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.6.11-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.6.11-compact.zip
index daf0b8f256..f451b3b4cf 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.6.11-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.6.11-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.6.11-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.6.11-legacy.zip
index b59a21cdc3..ec059f5457 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.6.11-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.6.11-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.6.12-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.6.12-compact.zip
index 5b146bee61..6c3f555063 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.6.12-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.6.12-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.6.12-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.6.12-legacy.zip
index 5b4e598e36..660fee4d8f 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.6.12-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.6.12-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.6.2-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.6.2-compact.zip
index 25b265f547..c8505fd5eb 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.6.2-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.6.2-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.6.2-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.6.2-legacy.zip
index a3591a1f0a..5bb2253c79 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.6.2-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.6.2-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.6.3-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.6.3-compact.zip
index 29f4032aae..d69bb15d13 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.6.3-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.6.3-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.6.3-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.6.3-legacy.zip
index 960422bd50..cb0ed55597 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.6.3-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.6.3-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.6.4-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.6.4-compact.zip
index d236e34caf..9324b26422 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.6.4-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.6.4-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.6.4-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.6.4-legacy.zip
index 28f2a0b1f5..7e2fab9ca7 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.6.4-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.6.4-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.6.5-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.6.5-compact.zip
index ea316dc6b9..475877da51 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.6.5-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.6.5-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.6.5-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.6.5-legacy.zip
index cee34d9e5d..2f7403ebb4 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.6.5-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.6.5-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.6.6-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.6.6-compact.zip
index 2a1cfe4a71..a1d38344ea 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.6.6-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.6.6-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.6.6-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.6.6-legacy.zip
index 7e229b641b..1c1675d371 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.6.6-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.6.6-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.6.7-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.6.7-compact.zip
index 530bb433eb..0ee4e95216 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.6.7-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.6.7-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.6.7-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.6.7-legacy.zip
index ed05105177..a58bb70271 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.6.7-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.6.7-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.6.8-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.6.8-compact.zip
index 23aea0c75d..cd1f9b9e61 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.6.8-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.6.8-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.6.8-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.6.8-legacy.zip
index 56013943e9..9366754ec9 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.6.8-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.6.8-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.6.9-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.6.9-compact.zip
index 7b9a86ea9b..5076082d6b 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.6.9-compact.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.6.9-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.6.9-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.6.9-legacy.zip
index f6151d928f..f91f96d4eb 100644
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.6.9-legacy.zip and b/tests/ast-parsing/compile/modifier-all.sol-0.6.9-legacy.zip differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.7.0-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.7.0-compact.zip
deleted file mode 100644
index cfdc87ec02..0000000000
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.7.0-compact.zip and /dev/null differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.7.0-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.7.0-legacy.zip
deleted file mode 100644
index d1113027b8..0000000000
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.7.0-legacy.zip and /dev/null differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.7.1-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.7.1-compact.zip
deleted file mode 100644
index b0995d5077..0000000000
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.7.1-compact.zip and /dev/null differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.7.1-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.7.1-legacy.zip
deleted file mode 100644
index 377809f67a..0000000000
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.7.1-legacy.zip and /dev/null differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.7.2-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.7.2-compact.zip
deleted file mode 100644
index 4117212dae..0000000000
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.7.2-compact.zip and /dev/null differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.7.2-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.7.2-legacy.zip
deleted file mode 100644
index 3dc1958e1f..0000000000
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.7.2-legacy.zip and /dev/null differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.7.3-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.7.3-compact.zip
deleted file mode 100644
index fc3c697b1b..0000000000
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.7.3-compact.zip and /dev/null differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.7.3-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.7.3-legacy.zip
deleted file mode 100644
index 1936c5cf42..0000000000
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.7.3-legacy.zip and /dev/null differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.7.4-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.7.4-compact.zip
deleted file mode 100644
index 819497795f..0000000000
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.7.4-compact.zip and /dev/null differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.7.4-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.7.4-legacy.zip
deleted file mode 100644
index f7c156912a..0000000000
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.7.4-legacy.zip and /dev/null differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.7.5-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.7.5-compact.zip
deleted file mode 100644
index 45075e0bf6..0000000000
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.7.5-compact.zip and /dev/null differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.7.5-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.7.5-legacy.zip
deleted file mode 100644
index 971fae4d2d..0000000000
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.7.5-legacy.zip and /dev/null differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.7.6-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.7.6-compact.zip
deleted file mode 100644
index 18d13d7385..0000000000
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.7.6-compact.zip and /dev/null differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.7.6-legacy.zip b/tests/ast-parsing/compile/modifier-all.sol-0.7.6-legacy.zip
deleted file mode 100644
index 6b4142f339..0000000000
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.7.6-legacy.zip and /dev/null differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.8.0-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.8.0-compact.zip
deleted file mode 100644
index 52deeb8f5f..0000000000
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.8.0-compact.zip and /dev/null differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.8.1-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.8.1-compact.zip
deleted file mode 100644
index 1f5cce5c6c..0000000000
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.8.1-compact.zip and /dev/null differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.8.10-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.8.10-compact.zip
deleted file mode 100644
index 26ea5c5ada..0000000000
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.8.10-compact.zip and /dev/null differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.8.11-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.8.11-compact.zip
deleted file mode 100644
index ff4b57bc4b..0000000000
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.8.11-compact.zip and /dev/null differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.8.12-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.8.12-compact.zip
deleted file mode 100644
index 2d9ff74883..0000000000
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.8.12-compact.zip and /dev/null differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.8.13-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.8.13-compact.zip
deleted file mode 100644
index 7845c49f6c..0000000000
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.8.13-compact.zip and /dev/null differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.8.14-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.8.14-compact.zip
deleted file mode 100644
index cdc342f123..0000000000
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.8.14-compact.zip and /dev/null differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.8.15-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.8.15-compact.zip
deleted file mode 100644
index d4d53a419e..0000000000
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.8.15-compact.zip and /dev/null differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.8.2-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.8.2-compact.zip
deleted file mode 100644
index 0d7b98ce9a..0000000000
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.8.2-compact.zip and /dev/null differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.8.3-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.8.3-compact.zip
deleted file mode 100644
index a1a5cb9987..0000000000
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.8.3-compact.zip and /dev/null differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.8.4-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.8.4-compact.zip
deleted file mode 100644
index 33e6f9631a..0000000000
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.8.4-compact.zip and /dev/null differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.8.5-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.8.5-compact.zip
deleted file mode 100644
index 6751bb8dab..0000000000
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.8.5-compact.zip and /dev/null differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.8.6-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.8.6-compact.zip
deleted file mode 100644
index e6393db5c1..0000000000
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.8.6-compact.zip and /dev/null differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.8.7-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.8.7-compact.zip
deleted file mode 100644
index ed7cbdfc87..0000000000
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.8.7-compact.zip and /dev/null differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.8.8-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.8.8-compact.zip
deleted file mode 100644
index 1e0c465096..0000000000
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.8.8-compact.zip and /dev/null differ
diff --git a/tests/ast-parsing/compile/modifier-all.sol-0.8.9-compact.zip b/tests/ast-parsing/compile/modifier-all.sol-0.8.9-compact.zip
deleted file mode 100644
index 7c12e42597..0000000000
Binary files a/tests/ast-parsing/compile/modifier-all.sol-0.8.9-compact.zip and /dev/null differ
diff --git a/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.0-compact.zip b/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.0-compact.zip
index f8a3c1a16a..0a7a5738d9 100644
Binary files a/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.0-compact.zip and b/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.0-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.1-compact.zip b/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.1-compact.zip
index cdb2a9daa3..cefe498b56 100644
Binary files a/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.1-compact.zip and b/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.1-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.10-compact.zip b/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.10-compact.zip
index 5fb6cde6b1..8dd1735625 100644
Binary files a/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.10-compact.zip and b/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.10-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.11-compact.zip b/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.11-compact.zip
index adf9a336ae..5b262c8376 100644
Binary files a/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.11-compact.zip and b/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.11-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.12-compact.zip b/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.12-compact.zip
index 7e6e7a65f5..6159756b98 100644
Binary files a/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.12-compact.zip and b/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.12-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.13-compact.zip b/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.13-compact.zip
index 47066aa8b6..41d76763d5 100644
Binary files a/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.13-compact.zip and b/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.13-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.14-compact.zip b/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.14-compact.zip
index 01de606fb0..eac4ef5fe7 100644
Binary files a/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.14-compact.zip and b/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.14-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.15-compact.zip b/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.15-compact.zip
index 233e4a87ff..9db5d23998 100644
Binary files a/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.15-compact.zip and b/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.15-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.2-compact.zip b/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.2-compact.zip
index b5fea85ed1..4cff0e9048 100644
Binary files a/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.2-compact.zip and b/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.2-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.3-compact.zip b/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.3-compact.zip
index 728beb81f1..c5b0b7f1ab 100644
Binary files a/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.3-compact.zip and b/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.3-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.4-compact.zip b/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.4-compact.zip
index 1eb88493e6..fb11df4aef 100644
Binary files a/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.4-compact.zip and b/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.4-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.5-compact.zip b/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.5-compact.zip
index 316ec58632..7418627bb7 100644
Binary files a/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.5-compact.zip and b/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.5-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.6-compact.zip b/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.6-compact.zip
index 6fd91e0e7f..b157c944e5 100644
Binary files a/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.6-compact.zip and b/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.6-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.7-compact.zip b/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.7-compact.zip
index 041c5ea9ea..a5d2432e06 100644
Binary files a/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.7-compact.zip and b/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.7-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.8-compact.zip b/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.8-compact.zip
index c132ab79a7..4956880810 100644
Binary files a/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.8-compact.zip and b/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.8-compact.zip differ
diff --git a/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.9-compact.zip b/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.9-compact.zip
index 1a06a3c57b..7d915f29b5 100644
Binary files a/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.9-compact.zip and b/tests/ast-parsing/compile/modifier_identifier_path.sol-0.8.9-compact.zip differ
diff --git a/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.0-compact.json b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.0-compact.json
new file mode 100644
index 0000000000..eaca6e24a6
--- /dev/null
+++ b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.0-compact.json
@@ -0,0 +1,12 @@
+{
+  "A": {
+    "f()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n",
+    "m()": "digraph{\n}\n"
+  },
+  "C": {
+    "onePlaceholder()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "multiplePlaceholders()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n1->2;\n2[label=\"Node Type: _ 2\n\"];\n2->3;\n3[label=\"Node Type: _ 3\n\"];\n}\n",
+    "acceptsVar(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "noParams()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n"
+  }
+}
\ No newline at end of file
diff --git a/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.0-legacy.json b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.0-legacy.json
new file mode 100644
index 0000000000..eaca6e24a6
--- /dev/null
+++ b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.0-legacy.json
@@ -0,0 +1,12 @@
+{
+  "A": {
+    "f()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n",
+    "m()": "digraph{\n}\n"
+  },
+  "C": {
+    "onePlaceholder()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "multiplePlaceholders()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n1->2;\n2[label=\"Node Type: _ 2\n\"];\n2->3;\n3[label=\"Node Type: _ 3\n\"];\n}\n",
+    "acceptsVar(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "noParams()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n"
+  }
+}
\ No newline at end of file
diff --git a/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.1-compact.json b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.1-compact.json
new file mode 100644
index 0000000000..eaca6e24a6
--- /dev/null
+++ b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.1-compact.json
@@ -0,0 +1,12 @@
+{
+  "A": {
+    "f()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n",
+    "m()": "digraph{\n}\n"
+  },
+  "C": {
+    "onePlaceholder()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "multiplePlaceholders()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n1->2;\n2[label=\"Node Type: _ 2\n\"];\n2->3;\n3[label=\"Node Type: _ 3\n\"];\n}\n",
+    "acceptsVar(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "noParams()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n"
+  }
+}
\ No newline at end of file
diff --git a/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.1-legacy.json b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.1-legacy.json
new file mode 100644
index 0000000000..eaca6e24a6
--- /dev/null
+++ b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.1-legacy.json
@@ -0,0 +1,12 @@
+{
+  "A": {
+    "f()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n",
+    "m()": "digraph{\n}\n"
+  },
+  "C": {
+    "onePlaceholder()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "multiplePlaceholders()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n1->2;\n2[label=\"Node Type: _ 2\n\"];\n2->3;\n3[label=\"Node Type: _ 3\n\"];\n}\n",
+    "acceptsVar(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "noParams()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n"
+  }
+}
\ No newline at end of file
diff --git a/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.2-compact.json b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.2-compact.json
new file mode 100644
index 0000000000..eaca6e24a6
--- /dev/null
+++ b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.2-compact.json
@@ -0,0 +1,12 @@
+{
+  "A": {
+    "f()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n",
+    "m()": "digraph{\n}\n"
+  },
+  "C": {
+    "onePlaceholder()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "multiplePlaceholders()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n1->2;\n2[label=\"Node Type: _ 2\n\"];\n2->3;\n3[label=\"Node Type: _ 3\n\"];\n}\n",
+    "acceptsVar(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "noParams()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n"
+  }
+}
\ No newline at end of file
diff --git a/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.2-legacy.json b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.2-legacy.json
new file mode 100644
index 0000000000..eaca6e24a6
--- /dev/null
+++ b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.2-legacy.json
@@ -0,0 +1,12 @@
+{
+  "A": {
+    "f()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n",
+    "m()": "digraph{\n}\n"
+  },
+  "C": {
+    "onePlaceholder()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "multiplePlaceholders()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n1->2;\n2[label=\"Node Type: _ 2\n\"];\n2->3;\n3[label=\"Node Type: _ 3\n\"];\n}\n",
+    "acceptsVar(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "noParams()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n"
+  }
+}
\ No newline at end of file
diff --git a/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.3-compact.json b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.3-compact.json
new file mode 100644
index 0000000000..eaca6e24a6
--- /dev/null
+++ b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.3-compact.json
@@ -0,0 +1,12 @@
+{
+  "A": {
+    "f()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n",
+    "m()": "digraph{\n}\n"
+  },
+  "C": {
+    "onePlaceholder()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "multiplePlaceholders()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n1->2;\n2[label=\"Node Type: _ 2\n\"];\n2->3;\n3[label=\"Node Type: _ 3\n\"];\n}\n",
+    "acceptsVar(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "noParams()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n"
+  }
+}
\ No newline at end of file
diff --git a/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.3-legacy.json b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.3-legacy.json
new file mode 100644
index 0000000000..eaca6e24a6
--- /dev/null
+++ b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.3-legacy.json
@@ -0,0 +1,12 @@
+{
+  "A": {
+    "f()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n",
+    "m()": "digraph{\n}\n"
+  },
+  "C": {
+    "onePlaceholder()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "multiplePlaceholders()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n1->2;\n2[label=\"Node Type: _ 2\n\"];\n2->3;\n3[label=\"Node Type: _ 3\n\"];\n}\n",
+    "acceptsVar(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "noParams()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n"
+  }
+}
\ No newline at end of file
diff --git a/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.4-compact.json b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.4-compact.json
new file mode 100644
index 0000000000..eaca6e24a6
--- /dev/null
+++ b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.4-compact.json
@@ -0,0 +1,12 @@
+{
+  "A": {
+    "f()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n",
+    "m()": "digraph{\n}\n"
+  },
+  "C": {
+    "onePlaceholder()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "multiplePlaceholders()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n1->2;\n2[label=\"Node Type: _ 2\n\"];\n2->3;\n3[label=\"Node Type: _ 3\n\"];\n}\n",
+    "acceptsVar(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "noParams()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n"
+  }
+}
\ No newline at end of file
diff --git a/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.4-legacy.json b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.4-legacy.json
new file mode 100644
index 0000000000..eaca6e24a6
--- /dev/null
+++ b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.4-legacy.json
@@ -0,0 +1,12 @@
+{
+  "A": {
+    "f()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n",
+    "m()": "digraph{\n}\n"
+  },
+  "C": {
+    "onePlaceholder()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "multiplePlaceholders()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n1->2;\n2[label=\"Node Type: _ 2\n\"];\n2->3;\n3[label=\"Node Type: _ 3\n\"];\n}\n",
+    "acceptsVar(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "noParams()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n"
+  }
+}
\ No newline at end of file
diff --git a/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.5-compact.json b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.5-compact.json
new file mode 100644
index 0000000000..eaca6e24a6
--- /dev/null
+++ b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.5-compact.json
@@ -0,0 +1,12 @@
+{
+  "A": {
+    "f()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n",
+    "m()": "digraph{\n}\n"
+  },
+  "C": {
+    "onePlaceholder()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "multiplePlaceholders()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n1->2;\n2[label=\"Node Type: _ 2\n\"];\n2->3;\n3[label=\"Node Type: _ 3\n\"];\n}\n",
+    "acceptsVar(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "noParams()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n"
+  }
+}
\ No newline at end of file
diff --git a/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.5-legacy.json b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.5-legacy.json
new file mode 100644
index 0000000000..eaca6e24a6
--- /dev/null
+++ b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.5-legacy.json
@@ -0,0 +1,12 @@
+{
+  "A": {
+    "f()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n",
+    "m()": "digraph{\n}\n"
+  },
+  "C": {
+    "onePlaceholder()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "multiplePlaceholders()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n1->2;\n2[label=\"Node Type: _ 2\n\"];\n2->3;\n3[label=\"Node Type: _ 3\n\"];\n}\n",
+    "acceptsVar(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "noParams()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n"
+  }
+}
\ No newline at end of file
diff --git a/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.6-compact.json b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.6-compact.json
new file mode 100644
index 0000000000..eaca6e24a6
--- /dev/null
+++ b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.6-compact.json
@@ -0,0 +1,12 @@
+{
+  "A": {
+    "f()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n",
+    "m()": "digraph{\n}\n"
+  },
+  "C": {
+    "onePlaceholder()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "multiplePlaceholders()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n1->2;\n2[label=\"Node Type: _ 2\n\"];\n2->3;\n3[label=\"Node Type: _ 3\n\"];\n}\n",
+    "acceptsVar(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "noParams()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n"
+  }
+}
\ No newline at end of file
diff --git a/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.6-legacy.json b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.6-legacy.json
new file mode 100644
index 0000000000..eaca6e24a6
--- /dev/null
+++ b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.7.6-legacy.json
@@ -0,0 +1,12 @@
+{
+  "A": {
+    "f()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n",
+    "m()": "digraph{\n}\n"
+  },
+  "C": {
+    "onePlaceholder()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "multiplePlaceholders()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n1->2;\n2[label=\"Node Type: _ 2\n\"];\n2->3;\n3[label=\"Node Type: _ 3\n\"];\n}\n",
+    "acceptsVar(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "noParams()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n"
+  }
+}
\ No newline at end of file
diff --git a/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.0-compact.json b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.0-compact.json
new file mode 100644
index 0000000000..eaca6e24a6
--- /dev/null
+++ b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.0-compact.json
@@ -0,0 +1,12 @@
+{
+  "A": {
+    "f()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n",
+    "m()": "digraph{\n}\n"
+  },
+  "C": {
+    "onePlaceholder()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "multiplePlaceholders()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n1->2;\n2[label=\"Node Type: _ 2\n\"];\n2->3;\n3[label=\"Node Type: _ 3\n\"];\n}\n",
+    "acceptsVar(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "noParams()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n"
+  }
+}
\ No newline at end of file
diff --git a/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.1-compact.json b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.1-compact.json
new file mode 100644
index 0000000000..eaca6e24a6
--- /dev/null
+++ b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.1-compact.json
@@ -0,0 +1,12 @@
+{
+  "A": {
+    "f()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n",
+    "m()": "digraph{\n}\n"
+  },
+  "C": {
+    "onePlaceholder()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "multiplePlaceholders()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n1->2;\n2[label=\"Node Type: _ 2\n\"];\n2->3;\n3[label=\"Node Type: _ 3\n\"];\n}\n",
+    "acceptsVar(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "noParams()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n"
+  }
+}
\ No newline at end of file
diff --git a/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.10-compact.json b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.10-compact.json
new file mode 100644
index 0000000000..eaca6e24a6
--- /dev/null
+++ b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.10-compact.json
@@ -0,0 +1,12 @@
+{
+  "A": {
+    "f()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n",
+    "m()": "digraph{\n}\n"
+  },
+  "C": {
+    "onePlaceholder()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "multiplePlaceholders()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n1->2;\n2[label=\"Node Type: _ 2\n\"];\n2->3;\n3[label=\"Node Type: _ 3\n\"];\n}\n",
+    "acceptsVar(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "noParams()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n"
+  }
+}
\ No newline at end of file
diff --git a/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.11-compact.json b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.11-compact.json
new file mode 100644
index 0000000000..eaca6e24a6
--- /dev/null
+++ b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.11-compact.json
@@ -0,0 +1,12 @@
+{
+  "A": {
+    "f()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n",
+    "m()": "digraph{\n}\n"
+  },
+  "C": {
+    "onePlaceholder()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "multiplePlaceholders()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n1->2;\n2[label=\"Node Type: _ 2\n\"];\n2->3;\n3[label=\"Node Type: _ 3\n\"];\n}\n",
+    "acceptsVar(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "noParams()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n"
+  }
+}
\ No newline at end of file
diff --git a/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.12-compact.json b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.12-compact.json
new file mode 100644
index 0000000000..eaca6e24a6
--- /dev/null
+++ b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.12-compact.json
@@ -0,0 +1,12 @@
+{
+  "A": {
+    "f()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n",
+    "m()": "digraph{\n}\n"
+  },
+  "C": {
+    "onePlaceholder()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "multiplePlaceholders()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n1->2;\n2[label=\"Node Type: _ 2\n\"];\n2->3;\n3[label=\"Node Type: _ 3\n\"];\n}\n",
+    "acceptsVar(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "noParams()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n"
+  }
+}
\ No newline at end of file
diff --git a/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.13-compact.json b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.13-compact.json
new file mode 100644
index 0000000000..eaca6e24a6
--- /dev/null
+++ b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.13-compact.json
@@ -0,0 +1,12 @@
+{
+  "A": {
+    "f()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n",
+    "m()": "digraph{\n}\n"
+  },
+  "C": {
+    "onePlaceholder()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "multiplePlaceholders()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n1->2;\n2[label=\"Node Type: _ 2\n\"];\n2->3;\n3[label=\"Node Type: _ 3\n\"];\n}\n",
+    "acceptsVar(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "noParams()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n"
+  }
+}
\ No newline at end of file
diff --git a/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.14-compact.json b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.14-compact.json
new file mode 100644
index 0000000000..eaca6e24a6
--- /dev/null
+++ b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.14-compact.json
@@ -0,0 +1,12 @@
+{
+  "A": {
+    "f()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n",
+    "m()": "digraph{\n}\n"
+  },
+  "C": {
+    "onePlaceholder()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "multiplePlaceholders()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n1->2;\n2[label=\"Node Type: _ 2\n\"];\n2->3;\n3[label=\"Node Type: _ 3\n\"];\n}\n",
+    "acceptsVar(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "noParams()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n"
+  }
+}
\ No newline at end of file
diff --git a/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.15-compact.json b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.15-compact.json
new file mode 100644
index 0000000000..eaca6e24a6
--- /dev/null
+++ b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.15-compact.json
@@ -0,0 +1,12 @@
+{
+  "A": {
+    "f()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n",
+    "m()": "digraph{\n}\n"
+  },
+  "C": {
+    "onePlaceholder()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "multiplePlaceholders()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n1->2;\n2[label=\"Node Type: _ 2\n\"];\n2->3;\n3[label=\"Node Type: _ 3\n\"];\n}\n",
+    "acceptsVar(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "noParams()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n"
+  }
+}
\ No newline at end of file
diff --git a/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.2-compact.json b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.2-compact.json
new file mode 100644
index 0000000000..eaca6e24a6
--- /dev/null
+++ b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.2-compact.json
@@ -0,0 +1,12 @@
+{
+  "A": {
+    "f()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n",
+    "m()": "digraph{\n}\n"
+  },
+  "C": {
+    "onePlaceholder()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "multiplePlaceholders()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n1->2;\n2[label=\"Node Type: _ 2\n\"];\n2->3;\n3[label=\"Node Type: _ 3\n\"];\n}\n",
+    "acceptsVar(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "noParams()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n"
+  }
+}
\ No newline at end of file
diff --git a/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.3-compact.json b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.3-compact.json
new file mode 100644
index 0000000000..eaca6e24a6
--- /dev/null
+++ b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.3-compact.json
@@ -0,0 +1,12 @@
+{
+  "A": {
+    "f()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n",
+    "m()": "digraph{\n}\n"
+  },
+  "C": {
+    "onePlaceholder()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "multiplePlaceholders()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n1->2;\n2[label=\"Node Type: _ 2\n\"];\n2->3;\n3[label=\"Node Type: _ 3\n\"];\n}\n",
+    "acceptsVar(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "noParams()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n"
+  }
+}
\ No newline at end of file
diff --git a/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.4-compact.json b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.4-compact.json
new file mode 100644
index 0000000000..eaca6e24a6
--- /dev/null
+++ b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.4-compact.json
@@ -0,0 +1,12 @@
+{
+  "A": {
+    "f()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n",
+    "m()": "digraph{\n}\n"
+  },
+  "C": {
+    "onePlaceholder()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "multiplePlaceholders()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n1->2;\n2[label=\"Node Type: _ 2\n\"];\n2->3;\n3[label=\"Node Type: _ 3\n\"];\n}\n",
+    "acceptsVar(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "noParams()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n"
+  }
+}
\ No newline at end of file
diff --git a/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.5-compact.json b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.5-compact.json
new file mode 100644
index 0000000000..eaca6e24a6
--- /dev/null
+++ b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.5-compact.json
@@ -0,0 +1,12 @@
+{
+  "A": {
+    "f()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n",
+    "m()": "digraph{\n}\n"
+  },
+  "C": {
+    "onePlaceholder()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "multiplePlaceholders()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n1->2;\n2[label=\"Node Type: _ 2\n\"];\n2->3;\n3[label=\"Node Type: _ 3\n\"];\n}\n",
+    "acceptsVar(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "noParams()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n"
+  }
+}
\ No newline at end of file
diff --git a/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.6-compact.json b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.6-compact.json
new file mode 100644
index 0000000000..eaca6e24a6
--- /dev/null
+++ b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.6-compact.json
@@ -0,0 +1,12 @@
+{
+  "A": {
+    "f()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n",
+    "m()": "digraph{\n}\n"
+  },
+  "C": {
+    "onePlaceholder()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "multiplePlaceholders()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n1->2;\n2[label=\"Node Type: _ 2\n\"];\n2->3;\n3[label=\"Node Type: _ 3\n\"];\n}\n",
+    "acceptsVar(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "noParams()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n"
+  }
+}
\ No newline at end of file
diff --git a/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.7-compact.json b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.7-compact.json
new file mode 100644
index 0000000000..eaca6e24a6
--- /dev/null
+++ b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.7-compact.json
@@ -0,0 +1,12 @@
+{
+  "A": {
+    "f()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n",
+    "m()": "digraph{\n}\n"
+  },
+  "C": {
+    "onePlaceholder()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "multiplePlaceholders()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n1->2;\n2[label=\"Node Type: _ 2\n\"];\n2->3;\n3[label=\"Node Type: _ 3\n\"];\n}\n",
+    "acceptsVar(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "noParams()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n"
+  }
+}
\ No newline at end of file
diff --git a/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.8-compact.json b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.8-compact.json
new file mode 100644
index 0000000000..eaca6e24a6
--- /dev/null
+++ b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.8-compact.json
@@ -0,0 +1,12 @@
+{
+  "A": {
+    "f()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n",
+    "m()": "digraph{\n}\n"
+  },
+  "C": {
+    "onePlaceholder()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "multiplePlaceholders()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n1->2;\n2[label=\"Node Type: _ 2\n\"];\n2->3;\n3[label=\"Node Type: _ 3\n\"];\n}\n",
+    "acceptsVar(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "noParams()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n"
+  }
+}
\ No newline at end of file
diff --git a/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.9-compact.json b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.9-compact.json
new file mode 100644
index 0000000000..eaca6e24a6
--- /dev/null
+++ b/tests/ast-parsing/expected/modifier-0.7.0.sol-0.8.9-compact.json
@@ -0,0 +1,12 @@
+{
+  "A": {
+    "f()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n",
+    "m()": "digraph{\n}\n"
+  },
+  "C": {
+    "onePlaceholder()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "multiplePlaceholders()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n1->2;\n2[label=\"Node Type: _ 2\n\"];\n2->3;\n3[label=\"Node Type: _ 3\n\"];\n}\n",
+    "acceptsVar(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n",
+    "noParams()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: _ 1\n\"];\n}\n"
+  }
+}
\ No newline at end of file
diff --git a/tests/ast-parsing/modifier-0.7.0.sol b/tests/ast-parsing/modifier-0.7.0.sol
new file mode 100644
index 0000000000..24240ad5e0
--- /dev/null
+++ b/tests/ast-parsing/modifier-0.7.0.sol
@@ -0,0 +1,27 @@
+abstract contract A{
+	modifier m() virtual;
+
+	function f() public m(){
+
+	}
+}
+
+contract C {
+    modifier onePlaceholder() {
+        _;
+    }
+
+    modifier multiplePlaceholders() {
+        _;
+        _;
+        _;
+    }
+
+    modifier acceptsVar(uint a) {
+        _;
+    }
+
+    modifier noParams {
+        _;
+    }
+}
diff --git a/tests/test_ast_parsing.py b/tests/test_ast_parsing.py
index 506ee3d6bb..f941038936 100644
--- a/tests/test_ast_parsing.py
+++ b/tests/test_ast_parsing.py
@@ -12,13 +12,13 @@
 from crytic_compile import CryticCompile, save_to_zip
 from crytic_compile.utils.zip import load_from_zip
 
-
 from slither import Slither
 from slither.printers.guidance.echidna import Echidna
 
 SLITHER_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 TEST_ROOT = os.path.join(SLITHER_ROOT, "tests", "ast-parsing")
 
+
 # pylint: disable=too-few-public-methods
 class Test:
     def __init__(self, test_file: str, solc_versions: List[str], disable_legacy: bool = False):
@@ -282,7 +282,11 @@ def make_version(minor: int, patch_min: int, patch_max: int) -> List[str]:
     ),
     Test(
         "modifier-all.sol",
-        ALL_VERSIONS,
+        VERSIONS_04 + VERSIONS_05 + VERSIONS_06,
+    ),
+    Test(
+        "modifier-0.7.0.sol",
+        VERSIONS_07 + VERSIONS_08,
     ),
     Test("library_implicit_conversion-0.4.0.sol", VERSIONS_04),
     Test(