Move tests that have " macro" or "reify" to disabled.

1020 files changed, 0 insertions, 0 deletions

diff --git a/tests/pending/pos/attachments-typed-another-ident/Impls_1.scala b/tests/disabled/macro/pos/attachments-typed-another-ident/Impls_1.scala
index 98062a9c7..98062a9c7 100644
--- a/tests/pending/pos/attachments-typed-another-ident/Impls_1.scala
+++ b/tests/disabled/macro/pos/attachments-typed-another-ident/Impls_1.scala
diff --git a/tests/pending/pos/attachments-typed-another-ident/Macros_Test_2.scala b/tests/disabled/macro/pos/attachments-typed-another-ident/Macros_Test_2.scala
index 022639bfe..022639bfe 100644
--- a/tests/pending/pos/attachments-typed-another-ident/Macros_Test_2.scala
+++ b/tests/disabled/macro/pos/attachments-typed-another-ident/Macros_Test_2.scala
diff --git a/tests/pending/pos/attachments-typed-ident/Impls_1.scala b/tests/disabled/macro/pos/attachments-typed-ident/Impls_1.scala
index 98062a9c7..98062a9c7 100644
--- a/tests/pending/pos/attachments-typed-ident/Impls_1.scala
+++ b/tests/disabled/macro/pos/attachments-typed-ident/Impls_1.scala
diff --git a/tests/pending/pos/attachments-typed-ident/Macros_Test_2.scala b/tests/disabled/macro/pos/attachments-typed-ident/Macros_Test_2.scala
index 45a0609de..45a0609de 100644
--- a/tests/pending/pos/attachments-typed-ident/Macros_Test_2.scala
+++ b/tests/disabled/macro/pos/attachments-typed-ident/Macros_Test_2.scala
diff --git a/tests/pending/pos/liftcode_polymorphic.scala b/tests/disabled/macro/pos/liftcode_polymorphic.scala
index 249f5a056..249f5a056 100644
--- a/tests/pending/pos/liftcode_polymorphic.scala
+++ b/tests/disabled/macro/pos/liftcode_polymorphic.scala
diff --git a/tests/pending/pos/macro-bundle-disambiguate-bundle.check b/tests/disabled/macro/pos/macro-bundle-disambiguate-bundle.check
index e69de29bb..e69de29bb 100644
--- a/tests/pending/pos/macro-bundle-disambiguate-bundle.check
+++ b/tests/disabled/macro/pos/macro-bundle-disambiguate-bundle.check
diff --git a/tests/pending/pos/macro-bundle-disambiguate-bundle.scala b/tests/disabled/macro/pos/macro-bundle-disambiguate-bundle.scala
index 40d965b0e..40d965b0e 100644
--- a/tests/pending/pos/macro-bundle-disambiguate-bundle.scala
+++ b/tests/disabled/macro/pos/macro-bundle-disambiguate-bundle.scala
diff --git a/tests/pending/pos/macro-bundle-disambiguate-nonbundle.check b/tests/disabled/macro/pos/macro-bundle-disambiguate-nonbundle.check
index e69de29bb..e69de29bb 100644
--- a/tests/pending/pos/macro-bundle-disambiguate-nonbundle.check
+++ b/tests/disabled/macro/pos/macro-bundle-disambiguate-nonbundle.check
diff --git a/tests/pending/pos/macro-bundle-disambiguate-nonbundle.scala b/tests/disabled/macro/pos/macro-bundle-disambiguate-nonbundle.scala
index 185177607..185177607 100644
--- a/tests/pending/pos/macro-bundle-disambiguate-nonbundle.scala
+++ b/tests/disabled/macro/pos/macro-bundle-disambiguate-nonbundle.scala
diff --git a/tests/pending/pos/macro-implicit-invalidate-on-error.check b/tests/disabled/macro/pos/macro-implicit-invalidate-on-error.check
index e69de29bb..e69de29bb 100644
--- a/tests/pending/pos/macro-implicit-invalidate-on-error.check
+++ b/tests/disabled/macro/pos/macro-implicit-invalidate-on-error.check
diff --git a/tests/pending/pos/macro-implicit-invalidate-on-error.scala b/tests/disabled/macro/pos/macro-implicit-invalidate-on-error.scala
index bb83e3cc3..bb83e3cc3 100644
--- a/tests/pending/pos/macro-implicit-invalidate-on-error.scala
+++ b/tests/disabled/macro/pos/macro-implicit-invalidate-on-error.scala
diff --git a/tests/pending/pos/macro-qmarkqmarkqmark.scala b/tests/disabled/macro/pos/macro-qmarkqmarkqmark.scala
index de94d69d5..de94d69d5 100644
--- a/tests/pending/pos/macro-qmarkqmarkqmark.scala
+++ b/tests/disabled/macro/pos/macro-qmarkqmarkqmark.scala
diff --git a/tests/pending/pos/t5223.scala b/tests/disabled/macro/pos/t5223.scala
index bfd1e153c..bfd1e153c 100644
--- a/tests/pending/pos/t5223.scala
+++ b/tests/disabled/macro/pos/t5223.scala
diff --git a/tests/pending/pos/t5692a/Macros_1.scala b/tests/disabled/macro/pos/t5692a/Macros_1.scala
index 6e5069aff..6e5069aff 100644
--- a/tests/pending/pos/t5692a/Macros_1.scala
+++ b/tests/disabled/macro/pos/t5692a/Macros_1.scala
diff --git a/tests/pending/pos/t5692a/Test_2.scala b/tests/disabled/macro/pos/t5692a/Test_2.scala
index 72ecd9576..72ecd9576 100644
--- a/tests/pending/pos/t5692a/Test_2.scala
+++ b/tests/disabled/macro/pos/t5692a/Test_2.scala
diff --git a/tests/pending/pos/t5692b/Macros_1.scala b/tests/disabled/macro/pos/t5692b/Macros_1.scala
index 82109075f..82109075f 100644
--- a/tests/pending/pos/t5692b/Macros_1.scala
+++ b/tests/disabled/macro/pos/t5692b/Macros_1.scala
diff --git a/tests/pending/pos/t5692b/Test_2.scala b/tests/disabled/macro/pos/t5692b/Test_2.scala
index 72ecd9576..72ecd9576 100644
--- a/tests/pending/pos/t5692b/Test_2.scala
+++ b/tests/disabled/macro/pos/t5692b/Test_2.scala
diff --git a/tests/pending/pos/t5706.flags b/tests/disabled/macro/pos/t5706.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/pos/t5706.flags
+++ b/tests/disabled/macro/pos/t5706.flags
diff --git a/tests/pending/pos/t5706.scala b/tests/disabled/macro/pos/t5706.scala
index 6f0207366..6f0207366 100644
--- a/tests/pending/pos/t5706.scala
+++ b/tests/disabled/macro/pos/t5706.scala
diff --git a/tests/pending/pos/t5744/Macros_1.scala b/tests/disabled/macro/pos/t5744/Macros_1.scala
index 11da37f17..11da37f17 100644
--- a/tests/pending/pos/t5744/Macros_1.scala
+++ b/tests/disabled/macro/pos/t5744/Macros_1.scala
diff --git a/tests/pending/pos/t5744/Test_2.scala b/tests/disabled/macro/pos/t5744/Test_2.scala
index dc3de03e4..dc3de03e4 100644
--- a/tests/pending/pos/t5744/Test_2.scala
+++ b/tests/disabled/macro/pos/t5744/Test_2.scala
diff --git a/tests/pending/pos/t6047.flags b/tests/disabled/macro/pos/t6047.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/pos/t6047.flags
+++ b/tests/disabled/macro/pos/t6047.flags
diff --git a/tests/pending/pos/t6047.scala b/tests/disabled/macro/pos/t6047.scala
index e7d0c38c6..e7d0c38c6 100644
--- a/tests/pending/pos/t6047.scala
+++ b/tests/disabled/macro/pos/t6047.scala
diff --git a/tests/pending/pos/t6386.scala b/tests/disabled/macro/pos/t6386.scala
index 4031ae267..4031ae267 100644
--- a/tests/pending/pos/t6386.scala
+++ b/tests/disabled/macro/pos/t6386.scala
diff --git a/tests/pending/pos/t6447.scala b/tests/disabled/macro/pos/t6447.scala
index 6ef69d485..6ef69d485 100644
--- a/tests/pending/pos/t6447.scala
+++ b/tests/disabled/macro/pos/t6447.scala
diff --git a/tests/pending/pos/t6485a/Macros_1.scala b/tests/disabled/macro/pos/t6485a/Macros_1.scala
index cc7dc3d3e..cc7dc3d3e 100644
--- a/tests/pending/pos/t6485a/Macros_1.scala
+++ b/tests/disabled/macro/pos/t6485a/Macros_1.scala
diff --git a/tests/pending/pos/t6485a/Test_2.scala b/tests/disabled/macro/pos/t6485a/Test_2.scala
index 54e260ac7..54e260ac7 100644
--- a/tests/pending/pos/t6485a/Test_2.scala
+++ b/tests/disabled/macro/pos/t6485a/Test_2.scala
diff --git a/tests/pending/pos/t6485b/Test.scala b/tests/disabled/macro/pos/t6485b/Test.scala
index 46d707073..46d707073 100644
--- a/tests/pending/pos/t6485b/Test.scala
+++ b/tests/disabled/macro/pos/t6485b/Test.scala
diff --git a/tests/pending/pos/t6516.scala b/tests/disabled/macro/pos/t6516.scala
index 2980d83eb..2980d83eb 100644
--- a/tests/pending/pos/t6516.scala
+++ b/tests/disabled/macro/pos/t6516.scala
diff --git a/tests/pending/pos/t7190.scala b/tests/disabled/macro/pos/t7190.scala
index 449e5c83f..449e5c83f 100644
--- a/tests/pending/pos/t7190.scala
+++ b/tests/disabled/macro/pos/t7190.scala
diff --git a/tests/pending/pos/t7377/Client_2.scala b/tests/disabled/macro/pos/t7377/Client_2.scala
index 5728956cc..5728956cc 100644
--- a/tests/pending/pos/t7377/Client_2.scala
+++ b/tests/disabled/macro/pos/t7377/Client_2.scala
diff --git a/tests/pending/pos/t7377/Macro_1.scala b/tests/disabled/macro/pos/t7377/Macro_1.scala
index b38687c8b..b38687c8b 100644
--- a/tests/pending/pos/t7377/Macro_1.scala
+++ b/tests/disabled/macro/pos/t7377/Macro_1.scala
diff --git a/tests/pending/pos/t7461/Macros_1.scala b/tests/disabled/macro/pos/t7461/Macros_1.scala
index 74ebf5af9..74ebf5af9 100644
--- a/tests/pending/pos/t7461/Macros_1.scala
+++ b/tests/disabled/macro/pos/t7461/Macros_1.scala
diff --git a/tests/pending/pos/t7461/Test_2.scala b/tests/disabled/macro/pos/t7461/Test_2.scala
index 866e3dc6f..866e3dc6f 100644
--- a/tests/pending/pos/t7461/Test_2.scala
+++ b/tests/disabled/macro/pos/t7461/Test_2.scala
diff --git a/tests/pending/pos/t7516/A_1.scala b/tests/disabled/macro/pos/t7516/A_1.scala
index 3bd477dcd..3bd477dcd 100644
--- a/tests/pending/pos/t7516/A_1.scala
+++ b/tests/disabled/macro/pos/t7516/A_1.scala
diff --git a/tests/pending/pos/t7516/B_2.scala b/tests/disabled/macro/pos/t7516/B_2.scala
index 1b8531bc8..1b8531bc8 100644
--- a/tests/pending/pos/t7516/B_2.scala
+++ b/tests/disabled/macro/pos/t7516/B_2.scala
diff --git a/tests/pending/pos/t7649.flags b/tests/disabled/macro/pos/t7649.flags
index fcf951d90..fcf951d90 100644
--- a/tests/pending/pos/t7649.flags
+++ b/tests/disabled/macro/pos/t7649.flags
diff --git a/tests/pending/pos/t7649.scala b/tests/disabled/macro/pos/t7649.scala
index d70dc05ea..d70dc05ea 100644
--- a/tests/pending/pos/t7649.scala
+++ b/tests/disabled/macro/pos/t7649.scala
diff --git a/tests/pending/pos/t7776.check b/tests/disabled/macro/pos/t7776.check
index e69de29bb..e69de29bb 100644
--- a/tests/pending/pos/t7776.check
+++ b/tests/disabled/macro/pos/t7776.check
diff --git a/tests/pending/pos/t7776.scala b/tests/disabled/macro/pos/t7776.scala
index 627d20dd6..627d20dd6 100644
--- a/tests/pending/pos/t7776.scala
+++ b/tests/disabled/macro/pos/t7776.scala
diff --git a/tests/pending/pos/t7987/Macro_1.scala b/tests/disabled/macro/pos/t7987/Macro_1.scala
index 81f717b9c..81f717b9c 100644
--- a/tests/pending/pos/t7987/Macro_1.scala
+++ b/tests/disabled/macro/pos/t7987/Macro_1.scala
diff --git a/tests/pending/pos/t7987/Test_2.scala b/tests/disabled/macro/pos/t7987/Test_2.scala
index aaa21ec4c..aaa21ec4c 100644
--- a/tests/pending/pos/t7987/Test_2.scala
+++ b/tests/disabled/macro/pos/t7987/Test_2.scala
diff --git a/tests/pending/pos/t8001/Macros_1.scala b/tests/disabled/macro/pos/t8001/Macros_1.scala
index 077082a9c..077082a9c 100644
--- a/tests/pending/pos/t8001/Macros_1.scala
+++ b/tests/disabled/macro/pos/t8001/Macros_1.scala
diff --git a/tests/pending/pos/t8001/Test_2.scala b/tests/disabled/macro/pos/t8001/Test_2.scala
index 55024506e..55024506e 100644
--- a/tests/pending/pos/t8001/Test_2.scala
+++ b/tests/disabled/macro/pos/t8001/Test_2.scala
diff --git a/tests/pending/pos/t8013/inpervolated_2.scala b/tests/disabled/macro/pos/t8013/inpervolated_2.scala
index 90e571b42..90e571b42 100644
--- a/tests/pending/pos/t8013/inpervolated_2.scala
+++ b/tests/disabled/macro/pos/t8013/inpervolated_2.scala
diff --git a/tests/pending/pos/t8013/inpervolator_1.scala b/tests/disabled/macro/pos/t8013/inpervolator_1.scala
index 612e1d727..612e1d727 100644
--- a/tests/pending/pos/t8013/inpervolator_1.scala
+++ b/tests/disabled/macro/pos/t8013/inpervolator_1.scala
diff --git a/tests/pending/pos/t8064/Client_2.scala b/tests/disabled/macro/pos/t8064/Client_2.scala
index 42c9b21ce..42c9b21ce 100644
--- a/tests/pending/pos/t8064/Client_2.scala
+++ b/tests/disabled/macro/pos/t8064/Client_2.scala
diff --git a/tests/pending/pos/t8064/Macro_1.scala b/tests/disabled/macro/pos/t8064/Macro_1.scala
index 9f1e6955b..9f1e6955b 100644
--- a/tests/pending/pos/t8064/Macro_1.scala
+++ b/tests/disabled/macro/pos/t8064/Macro_1.scala
diff --git a/tests/pending/pos/t8064b/Client_2.scala b/tests/disabled/macro/pos/t8064b/Client_2.scala
index 055b7a606..055b7a606 100644
--- a/tests/pending/pos/t8064b/Client_2.scala
+++ b/tests/disabled/macro/pos/t8064b/Client_2.scala
diff --git a/tests/pending/pos/t8064b/Macro_1.scala b/tests/disabled/macro/pos/t8064b/Macro_1.scala
index 60996bfec..60996bfec 100644
--- a/tests/pending/pos/t8064b/Macro_1.scala
+++ b/tests/disabled/macro/pos/t8064b/Macro_1.scala
diff --git a/tests/pending/pos/t8209a/Macros_1.scala b/tests/disabled/macro/pos/t8209a/Macros_1.scala
index 5d7852cb7..5d7852cb7 100644
--- a/tests/pending/pos/t8209a/Macros_1.scala
+++ b/tests/disabled/macro/pos/t8209a/Macros_1.scala
diff --git a/tests/pending/pos/t8209a/Test_2.scala b/tests/disabled/macro/pos/t8209a/Test_2.scala
index bedef776f..bedef776f 100644
--- a/tests/pending/pos/t8209a/Test_2.scala
+++ b/tests/disabled/macro/pos/t8209a/Test_2.scala
diff --git a/tests/pending/pos/t8209b/Macros_1.scala b/tests/disabled/macro/pos/t8209b/Macros_1.scala
index fa521d38d..fa521d38d 100644
--- a/tests/pending/pos/t8209b/Macros_1.scala
+++ b/tests/disabled/macro/pos/t8209b/Macros_1.scala
diff --git a/tests/pending/pos/t8209b/Test_2.scala b/tests/disabled/macro/pos/t8209b/Test_2.scala
index bedef776f..bedef776f 100644
--- a/tests/pending/pos/t8209b/Test_2.scala
+++ b/tests/disabled/macro/pos/t8209b/Test_2.scala
diff --git a/tests/pending/pos/t8352/Macros_1.scala b/tests/disabled/macro/pos/t8352/Macros_1.scala
index c1c63e57b..c1c63e57b 100644
--- a/tests/pending/pos/t8352/Macros_1.scala
+++ b/tests/disabled/macro/pos/t8352/Macros_1.scala
diff --git a/tests/pending/pos/t8352/Test_2.scala b/tests/disabled/macro/pos/t8352/Test_2.scala
index 1f84c3ca1..1f84c3ca1 100644
--- a/tests/pending/pos/t8352/Test_2.scala
+++ b/tests/disabled/macro/pos/t8352/Test_2.scala
diff --git a/tests/pending/run/exprs_serialize.check b/tests/disabled/macro/run/exprs_serialize.check
index 551823ccd..551823ccd 100644
--- a/tests/pending/run/exprs_serialize.check
+++ b/tests/disabled/macro/run/exprs_serialize.check
diff --git a/tests/pending/run/exprs_serialize.scala b/tests/disabled/macro/run/exprs_serialize.scala
index 85cf55e1c..85cf55e1c 100644
--- a/tests/pending/run/exprs_serialize.scala
+++ b/tests/disabled/macro/run/exprs_serialize.scala
diff --git a/tests/pending/run/freetypes_false_alarm1.check b/tests/disabled/macro/run/freetypes_false_alarm1.check
index 085b3ee50..085b3ee50 100644
--- a/tests/pending/run/freetypes_false_alarm1.check
+++ b/tests/disabled/macro/run/freetypes_false_alarm1.check
diff --git a/tests/pending/run/freetypes_false_alarm1.scala b/tests/disabled/macro/run/freetypes_false_alarm1.scala
index b06e10efe..b06e10efe 100644
--- a/tests/pending/run/freetypes_false_alarm1.scala
+++ b/tests/disabled/macro/run/freetypes_false_alarm1.scala
diff --git a/tests/pending/run/idempotency-case-classes.check b/tests/disabled/macro/run/idempotency-case-classes.check
index 5a8d0ad9d..5a8d0ad9d 100644
--- a/tests/pending/run/idempotency-case-classes.check
+++ b/tests/disabled/macro/run/idempotency-case-classes.check
diff --git a/tests/pending/run/idempotency-case-classes.scala b/tests/disabled/macro/run/idempotency-case-classes.scala
index 8c2aa70dc..8c2aa70dc 100644
--- a/tests/pending/run/idempotency-case-classes.scala
+++ b/tests/disabled/macro/run/idempotency-case-classes.scala
diff --git a/tests/pending/run/idempotency-extractors.check b/tests/disabled/macro/run/idempotency-extractors.check
index fcd50faa7..fcd50faa7 100644
--- a/tests/pending/run/idempotency-extractors.check
+++ b/tests/disabled/macro/run/idempotency-extractors.check
diff --git a/tests/pending/run/idempotency-extractors.scala b/tests/disabled/macro/run/idempotency-extractors.scala
index f5d6cd193..f5d6cd193 100644
--- a/tests/pending/run/idempotency-extractors.scala
+++ b/tests/disabled/macro/run/idempotency-extractors.scala
diff --git a/tests/pending/run/idempotency-labels.check b/tests/disabled/macro/run/idempotency-labels.check
index 8709efeb4..8709efeb4 100644
--- a/tests/pending/run/idempotency-labels.check
+++ b/tests/disabled/macro/run/idempotency-labels.check
diff --git a/tests/pending/run/idempotency-labels.scala b/tests/disabled/macro/run/idempotency-labels.scala
index 126063384..126063384 100644
--- a/tests/pending/run/idempotency-labels.scala
+++ b/tests/disabled/macro/run/idempotency-labels.scala
diff --git a/tests/pending/run/idempotency-lazy-vals.check b/tests/disabled/macro/run/idempotency-lazy-vals.check
index 15afa5303..15afa5303 100644
--- a/tests/pending/run/idempotency-lazy-vals.check
+++ b/tests/disabled/macro/run/idempotency-lazy-vals.check
diff --git a/tests/pending/run/idempotency-lazy-vals.scala b/tests/disabled/macro/run/idempotency-lazy-vals.scala
index cb757f1ab..cb757f1ab 100644
--- a/tests/pending/run/idempotency-lazy-vals.scala
+++ b/tests/disabled/macro/run/idempotency-lazy-vals.scala
diff --git a/tests/pending/run/idempotency-this.check b/tests/disabled/macro/run/idempotency-this.check
index 88b8288ad..88b8288ad 100644
--- a/tests/pending/run/idempotency-this.check
+++ b/tests/disabled/macro/run/idempotency-this.check
diff --git a/tests/pending/run/idempotency-this.scala b/tests/disabled/macro/run/idempotency-this.scala
index 2e2f7cf66..2e2f7cf66 100644
--- a/tests/pending/run/idempotency-this.scala
+++ b/tests/disabled/macro/run/idempotency-this.scala
diff --git a/tests/pending/run/macro-abort-fresh.check b/tests/disabled/macro/run/macro-abort-fresh.check
index 5064b96ee..5064b96ee 100644
--- a/tests/pending/run/macro-abort-fresh.check
+++ b/tests/disabled/macro/run/macro-abort-fresh.check
diff --git a/tests/pending/run/macro-abort-fresh.flags b/tests/disabled/macro/run/macro-abort-fresh.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-abort-fresh.flags
+++ b/tests/disabled/macro/run/macro-abort-fresh.flags
diff --git a/tests/pending/run/macro-abort-fresh/Macros_1.scala b/tests/disabled/macro/run/macro-abort-fresh/Macros_1.scala
index 2b03512ef..2b03512ef 100644
--- a/tests/pending/run/macro-abort-fresh/Macros_1.scala
+++ b/tests/disabled/macro/run/macro-abort-fresh/Macros_1.scala
diff --git a/tests/pending/run/macro-abort-fresh/Test_2.scala b/tests/disabled/macro/run/macro-abort-fresh/Test_2.scala
index dea6e6d62..dea6e6d62 100644
--- a/tests/pending/run/macro-abort-fresh/Test_2.scala
+++ b/tests/disabled/macro/run/macro-abort-fresh/Test_2.scala
diff --git a/tests/pending/run/macro-auto-duplicate.check b/tests/disabled/macro/run/macro-auto-duplicate.check
index d81cc0710..d81cc0710 100644
--- a/tests/pending/run/macro-auto-duplicate.check
+++ b/tests/disabled/macro/run/macro-auto-duplicate.check
diff --git a/tests/pending/run/macro-auto-duplicate/Macros_1.scala b/tests/disabled/macro/run/macro-auto-duplicate/Macros_1.scala
index 2c910e6af..2c910e6af 100644
--- a/tests/pending/run/macro-auto-duplicate/Macros_1.scala
+++ b/tests/disabled/macro/run/macro-auto-duplicate/Macros_1.scala
diff --git a/tests/pending/run/macro-auto-duplicate/Test_2.scala b/tests/disabled/macro/run/macro-auto-duplicate/Test_2.scala
index eed62a0fe..eed62a0fe 100644
--- a/tests/pending/run/macro-auto-duplicate/Test_2.scala
+++ b/tests/disabled/macro/run/macro-auto-duplicate/Test_2.scala
diff --git a/tests/pending/run/macro-basic-ma-md-mi.check b/tests/disabled/macro/run/macro-basic-ma-md-mi.check
index b74e882ae..b74e882ae 100644
--- a/tests/pending/run/macro-basic-ma-md-mi.check
+++ b/tests/disabled/macro/run/macro-basic-ma-md-mi.check
diff --git a/tests/pending/run/macro-basic-ma-md-mi.flags b/tests/disabled/macro/run/macro-basic-ma-md-mi.flags
index 5e5dd6ce7..5e5dd6ce7 100644
--- a/tests/pending/run/macro-basic-ma-md-mi.flags
+++ b/tests/disabled/macro/run/macro-basic-ma-md-mi.flags
diff --git a/tests/pending/run/macro-basic-ma-md-mi/Impls_1.scala b/tests/disabled/macro/run/macro-basic-ma-md-mi/Impls_1.scala
index fc75b99ef..fc75b99ef 100644
--- a/tests/pending/run/macro-basic-ma-md-mi/Impls_1.scala
+++ b/tests/disabled/macro/run/macro-basic-ma-md-mi/Impls_1.scala
diff --git a/tests/pending/run/macro-basic-ma-md-mi/Macros_2.scala b/tests/disabled/macro/run/macro-basic-ma-md-mi/Macros_2.scala
index 527904374..527904374 100644
--- a/tests/pending/run/macro-basic-ma-md-mi/Macros_2.scala
+++ b/tests/disabled/macro/run/macro-basic-ma-md-mi/Macros_2.scala
diff --git a/tests/pending/run/macro-basic-ma-md-mi/Test_3.scala b/tests/disabled/macro/run/macro-basic-ma-md-mi/Test_3.scala
index 9c45f59d7..9c45f59d7 100644
--- a/tests/pending/run/macro-basic-ma-md-mi/Test_3.scala
+++ b/tests/disabled/macro/run/macro-basic-ma-md-mi/Test_3.scala
diff --git a/tests/pending/run/macro-basic-ma-mdmi.check b/tests/disabled/macro/run/macro-basic-ma-mdmi.check
index b74e882ae..b74e882ae 100644
--- a/tests/pending/run/macro-basic-ma-mdmi.check
+++ b/tests/disabled/macro/run/macro-basic-ma-mdmi.check
diff --git a/tests/pending/run/macro-basic-ma-mdmi.flags b/tests/disabled/macro/run/macro-basic-ma-mdmi.flags
index 5e5dd6ce7..5e5dd6ce7 100644
--- a/tests/pending/run/macro-basic-ma-mdmi.flags
+++ b/tests/disabled/macro/run/macro-basic-ma-mdmi.flags
diff --git a/tests/pending/run/macro-basic-ma-mdmi/Impls_Macros_1.scala b/tests/disabled/macro/run/macro-basic-ma-mdmi/Impls_Macros_1.scala
index 73a5a971a..73a5a971a 100644
--- a/tests/pending/run/macro-basic-ma-mdmi/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/macro-basic-ma-mdmi/Impls_Macros_1.scala
diff --git a/tests/pending/run/macro-basic-ma-mdmi/Test_2.scala b/tests/disabled/macro/run/macro-basic-ma-mdmi/Test_2.scala
index 9c45f59d7..9c45f59d7 100644
--- a/tests/pending/run/macro-basic-ma-mdmi/Test_2.scala
+++ b/tests/disabled/macro/run/macro-basic-ma-mdmi/Test_2.scala
diff --git a/tests/pending/run/macro-basic-mamd-mi.check b/tests/disabled/macro/run/macro-basic-mamd-mi.check
index b74e882ae..b74e882ae 100644
--- a/tests/pending/run/macro-basic-mamd-mi.check
+++ b/tests/disabled/macro/run/macro-basic-mamd-mi.check
diff --git a/tests/pending/run/macro-basic-mamd-mi.flags b/tests/disabled/macro/run/macro-basic-mamd-mi.flags
index 5e5dd6ce7..5e5dd6ce7 100644
--- a/tests/pending/run/macro-basic-mamd-mi.flags
+++ b/tests/disabled/macro/run/macro-basic-mamd-mi.flags
diff --git a/tests/pending/run/macro-basic-mamd-mi/Impls_1.scala b/tests/disabled/macro/run/macro-basic-mamd-mi/Impls_1.scala
index 0be915c11..0be915c11 100644
--- a/tests/pending/run/macro-basic-mamd-mi/Impls_1.scala
+++ b/tests/disabled/macro/run/macro-basic-mamd-mi/Impls_1.scala
diff --git a/tests/pending/run/macro-basic-mamd-mi/Macros_Test_2.scala b/tests/disabled/macro/run/macro-basic-mamd-mi/Macros_Test_2.scala
index 9bfcbc4a7..9bfcbc4a7 100644
--- a/tests/pending/run/macro-basic-mamd-mi/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-basic-mamd-mi/Macros_Test_2.scala
diff --git a/tests/pending/run/macro-blackbox-materialization.check b/tests/disabled/macro/run/macro-blackbox-materialization.check
index 7165b734a..7165b734a 100644
--- a/tests/pending/run/macro-blackbox-materialization.check
+++ b/tests/disabled/macro/run/macro-blackbox-materialization.check
diff --git a/tests/pending/run/macro-blackbox-materialization/Macros_1.scala b/tests/disabled/macro/run/macro-blackbox-materialization/Macros_1.scala
index ea8d1bed1..ea8d1bed1 100644
--- a/tests/pending/run/macro-blackbox-materialization/Macros_1.scala
+++ b/tests/disabled/macro/run/macro-blackbox-materialization/Macros_1.scala
diff --git a/tests/pending/run/macro-blackbox-materialization/Test_2.scala b/tests/disabled/macro/run/macro-blackbox-materialization/Test_2.scala
index 1f0413bdf..1f0413bdf 100644
--- a/tests/pending/run/macro-blackbox-materialization/Test_2.scala
+++ b/tests/disabled/macro/run/macro-blackbox-materialization/Test_2.scala
diff --git a/tests/pending/run/macro-bodyexpandstoimpl.check b/tests/disabled/macro/run/macro-bodyexpandstoimpl.check
index f70d7bba4..f70d7bba4 100644
--- a/tests/pending/run/macro-bodyexpandstoimpl.check
+++ b/tests/disabled/macro/run/macro-bodyexpandstoimpl.check
diff --git a/tests/pending/run/macro-bodyexpandstoimpl.flags b/tests/disabled/macro/run/macro-bodyexpandstoimpl.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-bodyexpandstoimpl.flags
+++ b/tests/disabled/macro/run/macro-bodyexpandstoimpl.flags
diff --git a/tests/pending/run/macro-bodyexpandstoimpl/Impls_1.scala b/tests/disabled/macro/run/macro-bodyexpandstoimpl/Impls_1.scala
index d46af4952..d46af4952 100644
--- a/tests/pending/run/macro-bodyexpandstoimpl/Impls_1.scala
+++ b/tests/disabled/macro/run/macro-bodyexpandstoimpl/Impls_1.scala
diff --git a/tests/pending/run/macro-bodyexpandstoimpl/Macros_Test_2.scala b/tests/disabled/macro/run/macro-bodyexpandstoimpl/Macros_Test_2.scala
index f0fe4a8e3..f0fe4a8e3 100644
--- a/tests/pending/run/macro-bodyexpandstoimpl/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-bodyexpandstoimpl/Macros_Test_2.scala
diff --git a/tests/pending/run/macro-bundle-context-alias.check b/tests/disabled/macro/run/macro-bundle-context-alias.check
index 55e4dfcf9..55e4dfcf9 100644
--- a/tests/pending/run/macro-bundle-context-alias.check
+++ b/tests/disabled/macro/run/macro-bundle-context-alias.check
diff --git a/tests/pending/run/macro-bundle-context-alias/Macros_1.scala b/tests/disabled/macro/run/macro-bundle-context-alias/Macros_1.scala
index 354c5e0d9..354c5e0d9 100644
--- a/tests/pending/run/macro-bundle-context-alias/Macros_1.scala
+++ b/tests/disabled/macro/run/macro-bundle-context-alias/Macros_1.scala
diff --git a/tests/pending/run/macro-bundle-context-alias/Test_2.scala b/tests/disabled/macro/run/macro-bundle-context-alias/Test_2.scala
index 6c70277de..6c70277de 100644
--- a/tests/pending/run/macro-bundle-context-alias/Test_2.scala
+++ b/tests/disabled/macro/run/macro-bundle-context-alias/Test_2.scala
diff --git a/tests/pending/run/macro-bundle-context-refinement.check b/tests/disabled/macro/run/macro-bundle-context-refinement.check
index 10f9ebb61..10f9ebb61 100644
--- a/tests/pending/run/macro-bundle-context-refinement.check
+++ b/tests/disabled/macro/run/macro-bundle-context-refinement.check
diff --git a/tests/pending/run/macro-bundle-context-refinement/Macros_1.scala b/tests/disabled/macro/run/macro-bundle-context-refinement/Macros_1.scala
index d3a5d179c..d3a5d179c 100644
--- a/tests/pending/run/macro-bundle-context-refinement/Macros_1.scala
+++ b/tests/disabled/macro/run/macro-bundle-context-refinement/Macros_1.scala
diff --git a/tests/pending/run/macro-bundle-context-refinement/Test_2.scala b/tests/disabled/macro/run/macro-bundle-context-refinement/Test_2.scala
index d631b8f7e..d631b8f7e 100644
--- a/tests/pending/run/macro-bundle-context-refinement/Test_2.scala
+++ b/tests/disabled/macro/run/macro-bundle-context-refinement/Test_2.scala
diff --git a/tests/pending/run/macro-bundle-repl.check b/tests/disabled/macro/run/macro-bundle-repl.check
index 75c5c2add..75c5c2add 100644
--- a/tests/pending/run/macro-bundle-repl.check
+++ b/tests/disabled/macro/run/macro-bundle-repl.check
diff --git a/tests/pending/run/macro-bundle-repl.scala b/tests/disabled/macro/run/macro-bundle-repl.scala
index 808441845..808441845 100644
--- a/tests/pending/run/macro-bundle-repl.scala
+++ b/tests/disabled/macro/run/macro-bundle-repl.scala
diff --git a/tests/pending/run/macro-bundle-static.check b/tests/disabled/macro/run/macro-bundle-static.check
index 37c8eaf27..37c8eaf27 100644
--- a/tests/pending/run/macro-bundle-static.check
+++ b/tests/disabled/macro/run/macro-bundle-static.check
diff --git a/tests/pending/run/macro-bundle-static/Impls_Macros_1.scala b/tests/disabled/macro/run/macro-bundle-static/Impls_Macros_1.scala
index 0142e5d94..0142e5d94 100644
--- a/tests/pending/run/macro-bundle-static/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/macro-bundle-static/Impls_Macros_1.scala
diff --git a/tests/pending/run/macro-bundle-static/Test_2.scala b/tests/disabled/macro/run/macro-bundle-static/Test_2.scala
index cfc1e1563..cfc1e1563 100644
--- a/tests/pending/run/macro-bundle-static/Test_2.scala
+++ b/tests/disabled/macro/run/macro-bundle-static/Test_2.scala
diff --git a/tests/pending/run/macro-bundle-toplevel.check b/tests/disabled/macro/run/macro-bundle-toplevel.check
index 37c8eaf27..37c8eaf27 100644
--- a/tests/pending/run/macro-bundle-toplevel.check
+++ b/tests/disabled/macro/run/macro-bundle-toplevel.check
diff --git a/tests/pending/run/macro-bundle-toplevel.flags b/tests/disabled/macro/run/macro-bundle-toplevel.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-bundle-toplevel.flags
+++ b/tests/disabled/macro/run/macro-bundle-toplevel.flags
diff --git a/tests/pending/run/macro-bundle-toplevel/Impls_Macros_1.scala b/tests/disabled/macro/run/macro-bundle-toplevel/Impls_Macros_1.scala
index 6fd7be3b2..6fd7be3b2 100644
--- a/tests/pending/run/macro-bundle-toplevel/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/macro-bundle-toplevel/Impls_Macros_1.scala
diff --git a/tests/pending/run/macro-bundle-toplevel/Test_2.scala b/tests/disabled/macro/run/macro-bundle-toplevel/Test_2.scala
index 013baa348..013baa348 100644
--- a/tests/pending/run/macro-bundle-toplevel/Test_2.scala
+++ b/tests/disabled/macro/run/macro-bundle-toplevel/Test_2.scala
diff --git a/tests/pending/run/macro-bundle-whitebox-decl.check b/tests/disabled/macro/run/macro-bundle-whitebox-decl.check
index 37c8eaf27..37c8eaf27 100644
--- a/tests/pending/run/macro-bundle-whitebox-decl.check
+++ b/tests/disabled/macro/run/macro-bundle-whitebox-decl.check
diff --git a/tests/pending/run/macro-bundle-whitebox-decl/Impls_Macros_1.scala b/tests/disabled/macro/run/macro-bundle-whitebox-decl/Impls_Macros_1.scala
index 5e1b11895..5e1b11895 100644
--- a/tests/pending/run/macro-bundle-whitebox-decl/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/macro-bundle-whitebox-decl/Impls_Macros_1.scala
diff --git a/tests/pending/run/macro-bundle-whitebox-decl/Test_2.scala b/tests/disabled/macro/run/macro-bundle-whitebox-decl/Test_2.scala
index 013baa348..013baa348 100644
--- a/tests/pending/run/macro-bundle-whitebox-decl/Test_2.scala
+++ b/tests/disabled/macro/run/macro-bundle-whitebox-decl/Test_2.scala
diff --git a/tests/pending/run/macro-bundle-whitebox-use-raw.check b/tests/disabled/macro/run/macro-bundle-whitebox-use-raw.check
index 5679c5fab..5679c5fab 100644
--- a/tests/pending/run/macro-bundle-whitebox-use-raw.check
+++ b/tests/disabled/macro/run/macro-bundle-whitebox-use-raw.check
diff --git a/tests/pending/run/macro-bundle-whitebox-use-raw/Macros_1.scala b/tests/disabled/macro/run/macro-bundle-whitebox-use-raw/Macros_1.scala
index de1863418..de1863418 100644
--- a/tests/pending/run/macro-bundle-whitebox-use-raw/Macros_1.scala
+++ b/tests/disabled/macro/run/macro-bundle-whitebox-use-raw/Macros_1.scala
diff --git a/tests/pending/run/macro-bundle-whitebox-use-raw/Test_2.scala b/tests/disabled/macro/run/macro-bundle-whitebox-use-raw/Test_2.scala
index b28ebfd71..b28ebfd71 100644
--- a/tests/pending/run/macro-bundle-whitebox-use-raw/Test_2.scala
+++ b/tests/disabled/macro/run/macro-bundle-whitebox-use-raw/Test_2.scala
diff --git a/tests/pending/run/macro-bundle-whitebox-use-refined.check b/tests/disabled/macro/run/macro-bundle-whitebox-use-refined.check
index 5679c5fab..5679c5fab 100644
--- a/tests/pending/run/macro-bundle-whitebox-use-refined.check
+++ b/tests/disabled/macro/run/macro-bundle-whitebox-use-refined.check
diff --git a/tests/pending/run/macro-bundle-whitebox-use-refined/Macros_1.scala b/tests/disabled/macro/run/macro-bundle-whitebox-use-refined/Macros_1.scala
index de1863418..de1863418 100644
--- a/tests/pending/run/macro-bundle-whitebox-use-refined/Macros_1.scala
+++ b/tests/disabled/macro/run/macro-bundle-whitebox-use-refined/Macros_1.scala
diff --git a/tests/pending/run/macro-bundle-whitebox-use-refined/Test_2.scala b/tests/disabled/macro/run/macro-bundle-whitebox-use-refined/Test_2.scala
index b28ebfd71..b28ebfd71 100644
--- a/tests/pending/run/macro-bundle-whitebox-use-refined/Test_2.scala
+++ b/tests/disabled/macro/run/macro-bundle-whitebox-use-refined/Test_2.scala
diff --git a/tests/pending/run/macro-def-path-dependent.check b/tests/disabled/macro/run/macro-def-path-dependent.check
index 7658ad2c2..7658ad2c2 100644
--- a/tests/pending/run/macro-def-path-dependent.check
+++ b/tests/disabled/macro/run/macro-def-path-dependent.check
diff --git a/tests/pending/run/macro-def-path-dependent.flags b/tests/disabled/macro/run/macro-def-path-dependent.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-def-path-dependent.flags
+++ b/tests/disabled/macro/run/macro-def-path-dependent.flags
diff --git a/tests/pending/run/macro-def-path-dependent/Dummy.scala b/tests/disabled/macro/run/macro-def-path-dependent/Dummy.scala
index 2ccaa3940..2ccaa3940 100644
--- a/tests/pending/run/macro-def-path-dependent/Dummy.scala
+++ b/tests/disabled/macro/run/macro-def-path-dependent/Dummy.scala
diff --git a/tests/pending/run/macro-def-path-dependent/Test_1.scala b/tests/disabled/macro/run/macro-def-path-dependent/Test_1.scala
index 4161a6430..4161a6430 100644
--- a/tests/pending/run/macro-def-path-dependent/Test_1.scala
+++ b/tests/disabled/macro/run/macro-def-path-dependent/Test_1.scala
diff --git a/tests/pending/run/macro-def-path-dependent/Test_2.scala b/tests/disabled/macro/run/macro-def-path-dependent/Test_2.scala
index 75a03b54e..75a03b54e 100644
--- a/tests/pending/run/macro-def-path-dependent/Test_2.scala
+++ b/tests/disabled/macro/run/macro-def-path-dependent/Test_2.scala
diff --git a/tests/pending/run/macro-def-path-dependent/Test_3.scala b/tests/disabled/macro/run/macro-def-path-dependent/Test_3.scala
index 1a5da8200..1a5da8200 100644
--- a/tests/pending/run/macro-def-path-dependent/Test_3.scala
+++ b/tests/disabled/macro/run/macro-def-path-dependent/Test_3.scala
diff --git a/tests/pending/run/macro-def-path-dependent/Test_4.scala b/tests/disabled/macro/run/macro-def-path-dependent/Test_4.scala
index 67cb88ee6..67cb88ee6 100644
--- a/tests/pending/run/macro-def-path-dependent/Test_4.scala
+++ b/tests/disabled/macro/run/macro-def-path-dependent/Test_4.scala
diff --git a/tests/pending/run/macro-def-path-dependent/Test_5.scala b/tests/disabled/macro/run/macro-def-path-dependent/Test_5.scala
index b518ce864..b518ce864 100644
--- a/tests/pending/run/macro-def-path-dependent/Test_5.scala
+++ b/tests/disabled/macro/run/macro-def-path-dependent/Test_5.scala
diff --git a/tests/pending/run/macro-def-path-dependent/Test_6.scala b/tests/disabled/macro/run/macro-def-path-dependent/Test_6.scala
index a8b50ce7d..a8b50ce7d 100644
--- a/tests/pending/run/macro-def-path-dependent/Test_6.scala
+++ b/tests/disabled/macro/run/macro-def-path-dependent/Test_6.scala
diff --git a/tests/pending/run/macro-default-params.check b/tests/disabled/macro/run/macro-default-params.check
index 573541ac9..573541ac9 100644
--- a/tests/pending/run/macro-default-params.check
+++ b/tests/disabled/macro/run/macro-default-params.check
diff --git a/tests/pending/run/macro-default-params/Macros_1.scala b/tests/disabled/macro/run/macro-default-params/Macros_1.scala
index 74588a1cf..74588a1cf 100644
--- a/tests/pending/run/macro-default-params/Macros_1.scala
+++ b/tests/disabled/macro/run/macro-default-params/Macros_1.scala
diff --git a/tests/pending/run/macro-default-params/Test_2.scala b/tests/disabled/macro/run/macro-default-params/Test_2.scala
index d75fbd0db..d75fbd0db 100644
--- a/tests/pending/run/macro-default-params/Test_2.scala
+++ b/tests/disabled/macro/run/macro-default-params/Test_2.scala
diff --git a/tests/pending/run/macro-divergence-spurious.check b/tests/disabled/macro/run/macro-divergence-spurious.check
index 19765bd50..19765bd50 100644
--- a/tests/pending/run/macro-divergence-spurious.check
+++ b/tests/disabled/macro/run/macro-divergence-spurious.check
diff --git a/tests/pending/run/macro-divergence-spurious/Impls_Macros_1.scala b/tests/disabled/macro/run/macro-divergence-spurious/Impls_Macros_1.scala
index 7ac8fccc3..7ac8fccc3 100644
--- a/tests/pending/run/macro-divergence-spurious/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/macro-divergence-spurious/Impls_Macros_1.scala
diff --git a/tests/pending/run/macro-divergence-spurious/Test_2.scala b/tests/disabled/macro/run/macro-divergence-spurious/Test_2.scala
index 0a9820701..0a9820701 100644
--- a/tests/pending/run/macro-divergence-spurious/Test_2.scala
+++ b/tests/disabled/macro/run/macro-divergence-spurious/Test_2.scala
diff --git a/tests/pending/run/macro-duplicate.check b/tests/disabled/macro/run/macro-duplicate.check
index 58781b719..58781b719 100644
--- a/tests/pending/run/macro-duplicate.check
+++ b/tests/disabled/macro/run/macro-duplicate.check
diff --git a/tests/pending/run/macro-duplicate.flags b/tests/disabled/macro/run/macro-duplicate.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-duplicate.flags
+++ b/tests/disabled/macro/run/macro-duplicate.flags
diff --git a/tests/pending/run/macro-duplicate/Impls_Macros_1.scala b/tests/disabled/macro/run/macro-duplicate/Impls_Macros_1.scala
index 84fb2c5b6..84fb2c5b6 100644
--- a/tests/pending/run/macro-duplicate/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/macro-duplicate/Impls_Macros_1.scala
diff --git a/tests/pending/run/macro-duplicate/Test_2.scala b/tests/disabled/macro/run/macro-duplicate/Test_2.scala
index 8706883b4..8706883b4 100644
--- a/tests/pending/run/macro-duplicate/Test_2.scala
+++ b/tests/disabled/macro/run/macro-duplicate/Test_2.scala
diff --git a/tests/pending/run/macro-enclosingowner-detectvar.check b/tests/disabled/macro/run/macro-enclosingowner-detectvar.check
index c8f86ec73..c8f86ec73 100644
--- a/tests/pending/run/macro-enclosingowner-detectvar.check
+++ b/tests/disabled/macro/run/macro-enclosingowner-detectvar.check
diff --git a/tests/pending/run/macro-enclosingowner-detectvar/Macros_1.scala b/tests/disabled/macro/run/macro-enclosingowner-detectvar/Macros_1.scala
index 26ed64d8c..26ed64d8c 100644
--- a/tests/pending/run/macro-enclosingowner-detectvar/Macros_1.scala
+++ b/tests/disabled/macro/run/macro-enclosingowner-detectvar/Macros_1.scala
diff --git a/tests/pending/run/macro-enclosingowner-detectvar/Test_2.scala b/tests/disabled/macro/run/macro-enclosingowner-detectvar/Test_2.scala
index edc0eb654..edc0eb654 100644
--- a/tests/pending/run/macro-enclosingowner-detectvar/Test_2.scala
+++ b/tests/disabled/macro/run/macro-enclosingowner-detectvar/Test_2.scala
diff --git a/tests/pending/run/macro-enclosingowner-sbt.check b/tests/disabled/macro/run/macro-enclosingowner-sbt.check
index 3c95698e9..3c95698e9 100644
--- a/tests/pending/run/macro-enclosingowner-sbt.check
+++ b/tests/disabled/macro/run/macro-enclosingowner-sbt.check
diff --git a/tests/pending/run/macro-enclosingowner-sbt/Macros_1.scala b/tests/disabled/macro/run/macro-enclosingowner-sbt/Macros_1.scala
index a98a98486..a98a98486 100644
--- a/tests/pending/run/macro-enclosingowner-sbt/Macros_1.scala
+++ b/tests/disabled/macro/run/macro-enclosingowner-sbt/Macros_1.scala
diff --git a/tests/pending/run/macro-enclosingowner-sbt/Test_2.scala b/tests/disabled/macro/run/macro-enclosingowner-sbt/Test_2.scala
index edc0eb654..edc0eb654 100644
--- a/tests/pending/run/macro-enclosingowner-sbt/Test_2.scala
+++ b/tests/disabled/macro/run/macro-enclosingowner-sbt/Test_2.scala
diff --git a/tests/pending/run/macro-enclosures.check b/tests/disabled/macro/run/macro-enclosures.check
index b6fe7a4a9..b6fe7a4a9 100644
--- a/tests/pending/run/macro-enclosures.check
+++ b/tests/disabled/macro/run/macro-enclosures.check
diff --git a/tests/pending/run/macro-enclosures.flags b/tests/disabled/macro/run/macro-enclosures.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-enclosures.flags
+++ b/tests/disabled/macro/run/macro-enclosures.flags
diff --git a/tests/pending/run/macro-enclosures/Impls_Macros_1.scala b/tests/disabled/macro/run/macro-enclosures/Impls_Macros_1.scala
index 564cdfa68..564cdfa68 100644
--- a/tests/pending/run/macro-enclosures/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/macro-enclosures/Impls_Macros_1.scala
diff --git a/tests/pending/run/macro-enclosures/Test_2.scala b/tests/disabled/macro/run/macro-enclosures/Test_2.scala
index 8b8dc10cd..8b8dc10cd 100644
--- a/tests/pending/run/macro-enclosures/Test_2.scala
+++ b/tests/disabled/macro/run/macro-enclosures/Test_2.scala
diff --git a/tests/pending/run/macro-expand-implicit-argument.check b/tests/disabled/macro/run/macro-expand-implicit-argument.check
index 15a62794a..15a62794a 100644
--- a/tests/pending/run/macro-expand-implicit-argument.check
+++ b/tests/disabled/macro/run/macro-expand-implicit-argument.check
diff --git a/tests/pending/run/macro-expand-implicit-argument.flags b/tests/disabled/macro/run/macro-expand-implicit-argument.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-expand-implicit-argument.flags
+++ b/tests/disabled/macro/run/macro-expand-implicit-argument.flags
diff --git a/tests/pending/run/macro-expand-implicit-argument/Macros_1.scala b/tests/disabled/macro/run/macro-expand-implicit-argument/Macros_1.scala
index 465f313ef..465f313ef 100644
--- a/tests/pending/run/macro-expand-implicit-argument/Macros_1.scala
+++ b/tests/disabled/macro/run/macro-expand-implicit-argument/Macros_1.scala
diff --git a/tests/pending/run/macro-expand-implicit-argument/Test_2.scala b/tests/disabled/macro/run/macro-expand-implicit-argument/Test_2.scala
index edb1de413..edb1de413 100644
--- a/tests/pending/run/macro-expand-implicit-argument/Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-implicit-argument/Test_2.scala
diff --git a/tests/pending/run/macro-expand-implicit-macro-has-implicit.check b/tests/disabled/macro/run/macro-expand-implicit-macro-has-implicit.check
index d81cc0710..d81cc0710 100644
--- a/tests/pending/run/macro-expand-implicit-macro-has-implicit.check
+++ b/tests/disabled/macro/run/macro-expand-implicit-macro-has-implicit.check
diff --git a/tests/pending/run/macro-expand-implicit-macro-has-implicit.flags b/tests/disabled/macro/run/macro-expand-implicit-macro-has-implicit.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-expand-implicit-macro-has-implicit.flags
+++ b/tests/disabled/macro/run/macro-expand-implicit-macro-has-implicit.flags
diff --git a/tests/pending/run/macro-expand-implicit-macro-has-implicit/Impls_1.scala b/tests/disabled/macro/run/macro-expand-implicit-macro-has-implicit/Impls_1.scala
index 18c97956e..18c97956e 100644
--- a/tests/pending/run/macro-expand-implicit-macro-has-implicit/Impls_1.scala
+++ b/tests/disabled/macro/run/macro-expand-implicit-macro-has-implicit/Impls_1.scala
diff --git a/tests/pending/run/macro-expand-implicit-macro-has-implicit/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-implicit-macro-has-implicit/Macros_Test_2.scala
index 2f5648758..2f5648758 100644
--- a/tests/pending/run/macro-expand-implicit-macro-has-implicit/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-implicit-macro-has-implicit/Macros_Test_2.scala
diff --git a/tests/pending/run/macro-expand-implicit-macro-is-implicit.check b/tests/disabled/macro/run/macro-expand-implicit-macro-is-implicit.check
index c205945d0..c205945d0 100644
--- a/tests/pending/run/macro-expand-implicit-macro-is-implicit.check
+++ b/tests/disabled/macro/run/macro-expand-implicit-macro-is-implicit.check
diff --git a/tests/pending/run/macro-expand-implicit-macro-is-implicit.flags b/tests/disabled/macro/run/macro-expand-implicit-macro-is-implicit.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-expand-implicit-macro-is-implicit.flags
+++ b/tests/disabled/macro/run/macro-expand-implicit-macro-is-implicit.flags
diff --git a/tests/pending/run/macro-expand-implicit-macro-is-implicit/Impls_1.scala b/tests/disabled/macro/run/macro-expand-implicit-macro-is-implicit/Impls_1.scala
index aeceee5a5..aeceee5a5 100644
--- a/tests/pending/run/macro-expand-implicit-macro-is-implicit/Impls_1.scala
+++ b/tests/disabled/macro/run/macro-expand-implicit-macro-is-implicit/Impls_1.scala
diff --git a/tests/pending/run/macro-expand-implicit-macro-is-implicit/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-implicit-macro-is-implicit/Macros_Test_2.scala
index 8f0fbe60e..8f0fbe60e 100644
--- a/tests/pending/run/macro-expand-implicit-macro-is-implicit/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-implicit-macro-is-implicit/Macros_Test_2.scala
diff --git a/tests/pending/run/macro-expand-implicit-macro-is-val.check b/tests/disabled/macro/run/macro-expand-implicit-macro-is-val.check
index 0cfbf0888..0cfbf0888 100644
--- a/tests/pending/run/macro-expand-implicit-macro-is-val.check
+++ b/tests/disabled/macro/run/macro-expand-implicit-macro-is-val.check
diff --git a/tests/pending/run/macro-expand-implicit-macro-is-val.flags b/tests/disabled/macro/run/macro-expand-implicit-macro-is-val.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-expand-implicit-macro-is-val.flags
+++ b/tests/disabled/macro/run/macro-expand-implicit-macro-is-val.flags
diff --git a/tests/pending/run/macro-expand-implicit-macro-is-val/Impls_1.scala b/tests/disabled/macro/run/macro-expand-implicit-macro-is-val/Impls_1.scala
index fd267d32c..fd267d32c 100644
--- a/tests/pending/run/macro-expand-implicit-macro-is-val/Impls_1.scala
+++ b/tests/disabled/macro/run/macro-expand-implicit-macro-is-val/Impls_1.scala
diff --git a/tests/pending/run/macro-expand-implicit-macro-is-val/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-implicit-macro-is-val/Macros_Test_2.scala
index 3b851de05..3b851de05 100644
--- a/tests/pending/run/macro-expand-implicit-macro-is-val/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-implicit-macro-is-val/Macros_Test_2.scala
diff --git a/tests/pending/run/macro-expand-implicit-macro-is-view.check b/tests/disabled/macro/run/macro-expand-implicit-macro-is-view.check
index 0cfbf0888..0cfbf0888 100644
--- a/tests/pending/run/macro-expand-implicit-macro-is-view.check
+++ b/tests/disabled/macro/run/macro-expand-implicit-macro-is-view.check
diff --git a/tests/pending/run/macro-expand-implicit-macro-is-view/Impls_1.scala b/tests/disabled/macro/run/macro-expand-implicit-macro-is-view/Impls_1.scala
index d72db872e..d72db872e 100644
--- a/tests/pending/run/macro-expand-implicit-macro-is-view/Impls_1.scala
+++ b/tests/disabled/macro/run/macro-expand-implicit-macro-is-view/Impls_1.scala
diff --git a/tests/pending/run/macro-expand-implicit-macro-is-view/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-implicit-macro-is-view/Macros_Test_2.scala
index c7b09435a..c7b09435a 100644
--- a/tests/pending/run/macro-expand-implicit-macro-is-view/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-implicit-macro-is-view/Macros_Test_2.scala
diff --git a/tests/pending/run/macro-expand-multiple-arglists.check b/tests/disabled/macro/run/macro-expand-multiple-arglists.check
index c24b6ae77..c24b6ae77 100644
--- a/tests/pending/run/macro-expand-multiple-arglists.check
+++ b/tests/disabled/macro/run/macro-expand-multiple-arglists.check
diff --git a/tests/pending/run/macro-expand-multiple-arglists.flags b/tests/disabled/macro/run/macro-expand-multiple-arglists.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-expand-multiple-arglists.flags
+++ b/tests/disabled/macro/run/macro-expand-multiple-arglists.flags
diff --git a/tests/pending/run/macro-expand-multiple-arglists/Impls_1.scala b/tests/disabled/macro/run/macro-expand-multiple-arglists/Impls_1.scala
index 9278633c1..9278633c1 100644
--- a/tests/pending/run/macro-expand-multiple-arglists/Impls_1.scala
+++ b/tests/disabled/macro/run/macro-expand-multiple-arglists/Impls_1.scala
diff --git a/tests/pending/run/macro-expand-multiple-arglists/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-multiple-arglists/Macros_Test_2.scala
index 09de5e02f..09de5e02f 100644
--- a/tests/pending/run/macro-expand-multiple-arglists/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-multiple-arglists/Macros_Test_2.scala
diff --git a/tests/pending/run/macro-expand-nullary-generic.check b/tests/disabled/macro/run/macro-expand-nullary-generic.check
index 0470d239d..0470d239d 100644
--- a/tests/pending/run/macro-expand-nullary-generic.check
+++ b/tests/disabled/macro/run/macro-expand-nullary-generic.check
diff --git a/tests/pending/run/macro-expand-nullary-generic.flags b/tests/disabled/macro/run/macro-expand-nullary-generic.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-expand-nullary-generic.flags
+++ b/tests/disabled/macro/run/macro-expand-nullary-generic.flags
diff --git a/tests/pending/run/macro-expand-nullary-generic/Impls_1.scala b/tests/disabled/macro/run/macro-expand-nullary-generic/Impls_1.scala
index 9362d6c17..9362d6c17 100644
--- a/tests/pending/run/macro-expand-nullary-generic/Impls_1.scala
+++ b/tests/disabled/macro/run/macro-expand-nullary-generic/Impls_1.scala
diff --git a/tests/pending/run/macro-expand-nullary-generic/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-nullary-generic/Macros_Test_2.scala
index da418c63c..da418c63c 100644
--- a/tests/pending/run/macro-expand-nullary-generic/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-nullary-generic/Macros_Test_2.scala
diff --git a/tests/pending/run/macro-expand-nullary-nongeneric.check b/tests/disabled/macro/run/macro-expand-nullary-nongeneric.check
index cb7e76639..cb7e76639 100644
--- a/tests/pending/run/macro-expand-nullary-nongeneric.check
+++ b/tests/disabled/macro/run/macro-expand-nullary-nongeneric.check
diff --git a/tests/pending/run/macro-expand-nullary-nongeneric.flags b/tests/disabled/macro/run/macro-expand-nullary-nongeneric.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-expand-nullary-nongeneric.flags
+++ b/tests/disabled/macro/run/macro-expand-nullary-nongeneric.flags
diff --git a/tests/pending/run/macro-expand-nullary-nongeneric/Impls_1.scala b/tests/disabled/macro/run/macro-expand-nullary-nongeneric/Impls_1.scala
index c8c3d255c..c8c3d255c 100644
--- a/tests/pending/run/macro-expand-nullary-nongeneric/Impls_1.scala
+++ b/tests/disabled/macro/run/macro-expand-nullary-nongeneric/Impls_1.scala
diff --git a/tests/pending/run/macro-expand-nullary-nongeneric/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-nullary-nongeneric/Macros_Test_2.scala
index a14d981ce..a14d981ce 100644
--- a/tests/pending/run/macro-expand-nullary-nongeneric/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-nullary-nongeneric/Macros_Test_2.scala
diff --git a/tests/pending/run/macro-expand-overload.check b/tests/disabled/macro/run/macro-expand-overload.check
index a2b7b0e78..a2b7b0e78 100644
--- a/tests/pending/run/macro-expand-overload.check
+++ b/tests/disabled/macro/run/macro-expand-overload.check
diff --git a/tests/pending/run/macro-expand-overload.flags b/tests/disabled/macro/run/macro-expand-overload.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-expand-overload.flags
+++ b/tests/disabled/macro/run/macro-expand-overload.flags
diff --git a/tests/pending/run/macro-expand-overload/Impls_1.scala b/tests/disabled/macro/run/macro-expand-overload/Impls_1.scala
index ef9d01d4e..ef9d01d4e 100644
--- a/tests/pending/run/macro-expand-overload/Impls_1.scala
+++ b/tests/disabled/macro/run/macro-expand-overload/Impls_1.scala
diff --git a/tests/pending/run/macro-expand-overload/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-overload/Macros_Test_2.scala
index b367f35b7..b367f35b7 100644
--- a/tests/pending/run/macro-expand-overload/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-overload/Macros_Test_2.scala
diff --git a/tests/pending/run/macro-expand-override.check b/tests/disabled/macro/run/macro-expand-override.check
index b41dc156c..b41dc156c 100644
--- a/tests/pending/run/macro-expand-override.check
+++ b/tests/disabled/macro/run/macro-expand-override.check
diff --git a/tests/pending/run/macro-expand-override.flags b/tests/disabled/macro/run/macro-expand-override.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-expand-override.flags
+++ b/tests/disabled/macro/run/macro-expand-override.flags
diff --git a/tests/pending/run/macro-expand-override/Impls_1.scala b/tests/disabled/macro/run/macro-expand-override/Impls_1.scala
index e6ce18f17..e6ce18f17 100644
--- a/tests/pending/run/macro-expand-override/Impls_1.scala
+++ b/tests/disabled/macro/run/macro-expand-override/Impls_1.scala
diff --git a/tests/pending/run/macro-expand-override/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-override/Macros_Test_2.scala
index 46c1f49cc..46c1f49cc 100644
--- a/tests/pending/run/macro-expand-override/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-override/Macros_Test_2.scala
diff --git a/tests/pending/run/macro-expand-recursive.check b/tests/disabled/macro/run/macro-expand-recursive.check
index 7658ad2c2..7658ad2c2 100644
--- a/tests/pending/run/macro-expand-recursive.check
+++ b/tests/disabled/macro/run/macro-expand-recursive.check
diff --git a/tests/pending/run/macro-expand-recursive.flags b/tests/disabled/macro/run/macro-expand-recursive.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-expand-recursive.flags
+++ b/tests/disabled/macro/run/macro-expand-recursive.flags
diff --git a/tests/pending/run/macro-expand-recursive/Impls_1.scala b/tests/disabled/macro/run/macro-expand-recursive/Impls_1.scala
index 3def2d2fb..3def2d2fb 100644
--- a/tests/pending/run/macro-expand-recursive/Impls_1.scala
+++ b/tests/disabled/macro/run/macro-expand-recursive/Impls_1.scala
diff --git a/tests/pending/run/macro-expand-recursive/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-recursive/Macros_Test_2.scala
index e8a88afc9..e8a88afc9 100644
--- a/tests/pending/run/macro-expand-recursive/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-recursive/Macros_Test_2.scala
diff --git a/tests/pending/run/macro-expand-tparams-bounds.check b/tests/disabled/macro/run/macro-expand-tparams-bounds.check
index 317e9677c..317e9677c 100644
--- a/tests/pending/run/macro-expand-tparams-bounds.check
+++ b/tests/disabled/macro/run/macro-expand-tparams-bounds.check
diff --git a/tests/pending/run/macro-expand-tparams-bounds.flags b/tests/disabled/macro/run/macro-expand-tparams-bounds.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-expand-tparams-bounds.flags
+++ b/tests/disabled/macro/run/macro-expand-tparams-bounds.flags
diff --git a/tests/pending/run/macro-expand-tparams-bounds/Impls_1.scala b/tests/disabled/macro/run/macro-expand-tparams-bounds/Impls_1.scala
index 95aaa1c3d..95aaa1c3d 100644
--- a/tests/pending/run/macro-expand-tparams-bounds/Impls_1.scala
+++ b/tests/disabled/macro/run/macro-expand-tparams-bounds/Impls_1.scala
diff --git a/tests/pending/run/macro-expand-tparams-bounds/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-tparams-bounds/Macros_Test_2.scala
index f1cab82ec..f1cab82ec 100644
--- a/tests/pending/run/macro-expand-tparams-bounds/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-tparams-bounds/Macros_Test_2.scala
diff --git a/tests/pending/run/macro-expand-tparams-explicit.check b/tests/disabled/macro/run/macro-expand-tparams-explicit.check
index b6b4f6fa3..b6b4f6fa3 100644
--- a/tests/pending/run/macro-expand-tparams-explicit.check
+++ b/tests/disabled/macro/run/macro-expand-tparams-explicit.check
diff --git a/tests/pending/run/macro-expand-tparams-explicit.flags b/tests/disabled/macro/run/macro-expand-tparams-explicit.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-expand-tparams-explicit.flags
+++ b/tests/disabled/macro/run/macro-expand-tparams-explicit.flags
diff --git a/tests/pending/run/macro-expand-tparams-explicit/Impls_1.scala b/tests/disabled/macro/run/macro-expand-tparams-explicit/Impls_1.scala
index c33ac6d1b..c33ac6d1b 100644
--- a/tests/pending/run/macro-expand-tparams-explicit/Impls_1.scala
+++ b/tests/disabled/macro/run/macro-expand-tparams-explicit/Impls_1.scala
diff --git a/tests/pending/run/macro-expand-tparams-explicit/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-tparams-explicit/Macros_Test_2.scala
index 14154ee03..14154ee03 100644
--- a/tests/pending/run/macro-expand-tparams-explicit/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-tparams-explicit/Macros_Test_2.scala
diff --git a/tests/pending/run/macro-expand-tparams-implicit.check b/tests/disabled/macro/run/macro-expand-tparams-implicit.check
index a9bf55423..a9bf55423 100644
--- a/tests/pending/run/macro-expand-tparams-implicit.check
+++ b/tests/disabled/macro/run/macro-expand-tparams-implicit.check
diff --git a/tests/pending/run/macro-expand-tparams-implicit.flags b/tests/disabled/macro/run/macro-expand-tparams-implicit.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-expand-tparams-implicit.flags
+++ b/tests/disabled/macro/run/macro-expand-tparams-implicit.flags
diff --git a/tests/pending/run/macro-expand-tparams-implicit/Impls_1.scala b/tests/disabled/macro/run/macro-expand-tparams-implicit/Impls_1.scala
index 32cee0d5f..32cee0d5f 100644
--- a/tests/pending/run/macro-expand-tparams-implicit/Impls_1.scala
+++ b/tests/disabled/macro/run/macro-expand-tparams-implicit/Impls_1.scala
diff --git a/tests/pending/run/macro-expand-tparams-implicit/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-tparams-implicit/Macros_Test_2.scala
index 386817469..386817469 100644
--- a/tests/pending/run/macro-expand-tparams-implicit/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-tparams-implicit/Macros_Test_2.scala
diff --git a/tests/pending/run/macro-expand-tparams-prefix.check b/tests/disabled/macro/run/macro-expand-tparams-prefix.check
index 739795806..739795806 100644
--- a/tests/pending/run/macro-expand-tparams-prefix.check
+++ b/tests/disabled/macro/run/macro-expand-tparams-prefix.check
diff --git a/tests/pending/run/macro-expand-tparams-prefix.flags b/tests/disabled/macro/run/macro-expand-tparams-prefix.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-expand-tparams-prefix.flags
+++ b/tests/disabled/macro/run/macro-expand-tparams-prefix.flags
diff --git a/tests/pending/run/macro-expand-tparams-prefix/Impls_1.scala b/tests/disabled/macro/run/macro-expand-tparams-prefix/Impls_1.scala
index 289f07162..289f07162 100644
--- a/tests/pending/run/macro-expand-tparams-prefix/Impls_1.scala
+++ b/tests/disabled/macro/run/macro-expand-tparams-prefix/Impls_1.scala
diff --git a/tests/pending/run/macro-expand-tparams-prefix/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-tparams-prefix/Macros_Test_2.scala
index 8916f03e4..8916f03e4 100644
--- a/tests/pending/run/macro-expand-tparams-prefix/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-tparams-prefix/Macros_Test_2.scala
diff --git a/tests/pending/run/macro-expand-unapply-a.check b/tests/disabled/macro/run/macro-expand-unapply-a.check
index 7c2976e51..7c2976e51 100644
--- a/tests/pending/run/macro-expand-unapply-a.check
+++ b/tests/disabled/macro/run/macro-expand-unapply-a.check
diff --git a/tests/pending/run/macro-expand-unapply-a.flags b/tests/disabled/macro/run/macro-expand-unapply-a.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-expand-unapply-a.flags
+++ b/tests/disabled/macro/run/macro-expand-unapply-a.flags
diff --git a/tests/pending/run/macro-expand-unapply-a/Impls_Macros_1.scala b/tests/disabled/macro/run/macro-expand-unapply-a/Impls_Macros_1.scala
index 64f16c6a8..64f16c6a8 100644
--- a/tests/pending/run/macro-expand-unapply-a/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/macro-expand-unapply-a/Impls_Macros_1.scala
diff --git a/tests/pending/run/macro-expand-unapply-a/Test_2.scala b/tests/disabled/macro/run/macro-expand-unapply-a/Test_2.scala
index ce52df802..ce52df802 100644
--- a/tests/pending/run/macro-expand-unapply-a/Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-unapply-a/Test_2.scala
diff --git a/tests/pending/run/macro-expand-varargs-explicit-over-nonvarargs-bad.check b/tests/disabled/macro/run/macro-expand-varargs-explicit-over-nonvarargs-bad.check
index 2709b5703..2709b5703 100644
--- a/tests/pending/run/macro-expand-varargs-explicit-over-nonvarargs-bad.check
+++ b/tests/disabled/macro/run/macro-expand-varargs-explicit-over-nonvarargs-bad.check
diff --git a/tests/pending/run/macro-expand-varargs-explicit-over-nonvarargs-bad.flags b/tests/disabled/macro/run/macro-expand-varargs-explicit-over-nonvarargs-bad.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-expand-varargs-explicit-over-nonvarargs-bad.flags
+++ b/tests/disabled/macro/run/macro-expand-varargs-explicit-over-nonvarargs-bad.flags
diff --git a/tests/pending/run/macro-expand-varargs-explicit-over-nonvarargs-bad/Impls_1.scala b/tests/disabled/macro/run/macro-expand-varargs-explicit-over-nonvarargs-bad/Impls_1.scala
index 18af84583..18af84583 100644
--- a/tests/pending/run/macro-expand-varargs-explicit-over-nonvarargs-bad/Impls_1.scala
+++ b/tests/disabled/macro/run/macro-expand-varargs-explicit-over-nonvarargs-bad/Impls_1.scala
diff --git a/tests/pending/run/macro-expand-varargs-explicit-over-nonvarargs-bad/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-varargs-explicit-over-nonvarargs-bad/Macros_Test_2.scala
index 868fb8d91..868fb8d91 100644
--- a/tests/pending/run/macro-expand-varargs-explicit-over-nonvarargs-bad/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-varargs-explicit-over-nonvarargs-bad/Macros_Test_2.scala
diff --git a/tests/pending/run/macro-expand-varargs-explicit-over-nonvarargs-good.check b/tests/disabled/macro/run/macro-expand-varargs-explicit-over-nonvarargs-good.check
index fe90caed3..fe90caed3 100644
--- a/tests/pending/run/macro-expand-varargs-explicit-over-nonvarargs-good.check
+++ b/tests/disabled/macro/run/macro-expand-varargs-explicit-over-nonvarargs-good.check
diff --git a/tests/pending/run/macro-expand-varargs-explicit-over-nonvarargs-good.flags b/tests/disabled/macro/run/macro-expand-varargs-explicit-over-nonvarargs-good.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-expand-varargs-explicit-over-nonvarargs-good.flags
+++ b/tests/disabled/macro/run/macro-expand-varargs-explicit-over-nonvarargs-good.flags
diff --git a/tests/pending/run/macro-expand-varargs-explicit-over-nonvarargs-good/Impls_1.scala b/tests/disabled/macro/run/macro-expand-varargs-explicit-over-nonvarargs-good/Impls_1.scala
index eb067c25a..eb067c25a 100644
--- a/tests/pending/run/macro-expand-varargs-explicit-over-nonvarargs-good/Impls_1.scala
+++ b/tests/disabled/macro/run/macro-expand-varargs-explicit-over-nonvarargs-good/Impls_1.scala
diff --git a/tests/pending/run/macro-expand-varargs-explicit-over-nonvarargs-good/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-varargs-explicit-over-nonvarargs-good/Macros_Test_2.scala
index 7eba411cd..7eba411cd 100644
--- a/tests/pending/run/macro-expand-varargs-explicit-over-nonvarargs-good/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-varargs-explicit-over-nonvarargs-good/Macros_Test_2.scala
diff --git a/tests/pending/run/macro-expand-varargs-explicit-over-varargs.check b/tests/disabled/macro/run/macro-expand-varargs-explicit-over-varargs.check
index fe90caed3..fe90caed3 100644
--- a/tests/pending/run/macro-expand-varargs-explicit-over-varargs.check
+++ b/tests/disabled/macro/run/macro-expand-varargs-explicit-over-varargs.check
diff --git a/tests/pending/run/macro-expand-varargs-explicit-over-varargs.flags b/tests/disabled/macro/run/macro-expand-varargs-explicit-over-varargs.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-expand-varargs-explicit-over-varargs.flags
+++ b/tests/disabled/macro/run/macro-expand-varargs-explicit-over-varargs.flags
diff --git a/tests/pending/run/macro-expand-varargs-explicit-over-varargs/Impls_1.scala b/tests/disabled/macro/run/macro-expand-varargs-explicit-over-varargs/Impls_1.scala
index 64ab7de02..64ab7de02 100644
--- a/tests/pending/run/macro-expand-varargs-explicit-over-varargs/Impls_1.scala
+++ b/tests/disabled/macro/run/macro-expand-varargs-explicit-over-varargs/Impls_1.scala
diff --git a/tests/pending/run/macro-expand-varargs-explicit-over-varargs/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-varargs-explicit-over-varargs/Macros_Test_2.scala
index 7eba411cd..7eba411cd 100644
--- a/tests/pending/run/macro-expand-varargs-explicit-over-varargs/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-varargs-explicit-over-varargs/Macros_Test_2.scala
diff --git a/tests/pending/run/macro-expand-varargs-implicit-over-nonvarargs.check b/tests/disabled/macro/run/macro-expand-varargs-implicit-over-nonvarargs.check
index bcfab1984..bcfab1984 100644
--- a/tests/pending/run/macro-expand-varargs-implicit-over-nonvarargs.check
+++ b/tests/disabled/macro/run/macro-expand-varargs-implicit-over-nonvarargs.check
diff --git a/tests/pending/run/macro-expand-varargs-implicit-over-nonvarargs.flags b/tests/disabled/macro/run/macro-expand-varargs-implicit-over-nonvarargs.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-expand-varargs-implicit-over-nonvarargs.flags
+++ b/tests/disabled/macro/run/macro-expand-varargs-implicit-over-nonvarargs.flags
diff --git a/tests/pending/run/macro-expand-varargs-implicit-over-nonvarargs/Impls_1.scala b/tests/disabled/macro/run/macro-expand-varargs-implicit-over-nonvarargs/Impls_1.scala
index 18af84583..18af84583 100644
--- a/tests/pending/run/macro-expand-varargs-implicit-over-nonvarargs/Impls_1.scala
+++ b/tests/disabled/macro/run/macro-expand-varargs-implicit-over-nonvarargs/Impls_1.scala
diff --git a/tests/pending/run/macro-expand-varargs-implicit-over-nonvarargs/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-varargs-implicit-over-nonvarargs/Macros_Test_2.scala
index f50a5d742..f50a5d742 100644
--- a/tests/pending/run/macro-expand-varargs-implicit-over-nonvarargs/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-varargs-implicit-over-nonvarargs/Macros_Test_2.scala
diff --git a/tests/pending/run/macro-expand-varargs-implicit-over-varargs.check b/tests/disabled/macro/run/macro-expand-varargs-implicit-over-varargs.check
index 2c174a8a9..2c174a8a9 100644
--- a/tests/pending/run/macro-expand-varargs-implicit-over-varargs.check
+++ b/tests/disabled/macro/run/macro-expand-varargs-implicit-over-varargs.check
diff --git a/tests/pending/run/macro-expand-varargs-implicit-over-varargs.flags b/tests/disabled/macro/run/macro-expand-varargs-implicit-over-varargs.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-expand-varargs-implicit-over-varargs.flags
+++ b/tests/disabled/macro/run/macro-expand-varargs-implicit-over-varargs.flags
diff --git a/tests/pending/run/macro-expand-varargs-implicit-over-varargs/Impls_1.scala b/tests/disabled/macro/run/macro-expand-varargs-implicit-over-varargs/Impls_1.scala
index 64ab7de02..64ab7de02 100644
--- a/tests/pending/run/macro-expand-varargs-implicit-over-varargs/Impls_1.scala
+++ b/tests/disabled/macro/run/macro-expand-varargs-implicit-over-varargs/Impls_1.scala
diff --git a/tests/pending/run/macro-expand-varargs-implicit-over-varargs/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-varargs-implicit-over-varargs/Macros_Test_2.scala
index f50a5d742..f50a5d742 100644
--- a/tests/pending/run/macro-expand-varargs-implicit-over-varargs/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-varargs-implicit-over-varargs/Macros_Test_2.scala
diff --git a/tests/pending/run/macro-impl-default-params.check b/tests/disabled/macro/run/macro-impl-default-params.check
index b32e34570..b32e34570 100644
--- a/tests/pending/run/macro-impl-default-params.check
+++ b/tests/disabled/macro/run/macro-impl-default-params.check
diff --git a/tests/pending/run/macro-impl-default-params.flags b/tests/disabled/macro/run/macro-impl-default-params.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-impl-default-params.flags
+++ b/tests/disabled/macro/run/macro-impl-default-params.flags
diff --git a/tests/pending/run/macro-impl-default-params/Impls_Macros_1.scala b/tests/disabled/macro/run/macro-impl-default-params/Impls_Macros_1.scala
index 9b1d0eed3..9b1d0eed3 100644
--- a/tests/pending/run/macro-impl-default-params/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/macro-impl-default-params/Impls_Macros_1.scala
diff --git a/tests/pending/run/macro-impl-default-params/Test_2.scala b/tests/disabled/macro/run/macro-impl-default-params/Test_2.scala
index 476c881f8..476c881f8 100644
--- a/tests/pending/run/macro-impl-default-params/Test_2.scala
+++ b/tests/disabled/macro/run/macro-impl-default-params/Test_2.scala
diff --git a/tests/pending/run/macro-impl-relaxed.check b/tests/disabled/macro/run/macro-impl-relaxed.check
index 487b11653..487b11653 100644
--- a/tests/pending/run/macro-impl-relaxed.check
+++ b/tests/disabled/macro/run/macro-impl-relaxed.check
diff --git a/tests/pending/run/macro-impl-relaxed/Macros_1.scala b/tests/disabled/macro/run/macro-impl-relaxed/Macros_1.scala
index 420eb2a39..420eb2a39 100644
--- a/tests/pending/run/macro-impl-relaxed/Macros_1.scala
+++ b/tests/disabled/macro/run/macro-impl-relaxed/Macros_1.scala
diff --git a/tests/pending/run/macro-impl-relaxed/Test_2.scala b/tests/disabled/macro/run/macro-impl-relaxed/Test_2.scala
index 460626272..460626272 100644
--- a/tests/pending/run/macro-impl-relaxed/Test_2.scala
+++ b/tests/disabled/macro/run/macro-impl-relaxed/Test_2.scala
diff --git a/tests/pending/run/macro-impl-rename-context.check b/tests/disabled/macro/run/macro-impl-rename-context.check
index 6a34e5fd8..6a34e5fd8 100644
--- a/tests/pending/run/macro-impl-rename-context.check
+++ b/tests/disabled/macro/run/macro-impl-rename-context.check
diff --git a/tests/pending/run/macro-impl-rename-context.flags b/tests/disabled/macro/run/macro-impl-rename-context.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-impl-rename-context.flags
+++ b/tests/disabled/macro/run/macro-impl-rename-context.flags
diff --git a/tests/pending/run/macro-impl-rename-context/Impls_Macros_1.scala b/tests/disabled/macro/run/macro-impl-rename-context/Impls_Macros_1.scala
index acc47fcde..acc47fcde 100644
--- a/tests/pending/run/macro-impl-rename-context/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/macro-impl-rename-context/Impls_Macros_1.scala
diff --git a/tests/pending/run/macro-impl-rename-context/Test_2.scala b/tests/disabled/macro/run/macro-impl-rename-context/Test_2.scala
index 6b1cdecd0..6b1cdecd0 100644
--- a/tests/pending/run/macro-impl-rename-context/Test_2.scala
+++ b/tests/disabled/macro/run/macro-impl-rename-context/Test_2.scala
diff --git a/tests/pending/run/macro-impl-tparam-only-in-impl.check b/tests/disabled/macro/run/macro-impl-tparam-only-in-impl.check
index 3b18e512d..3b18e512d 100644
--- a/tests/pending/run/macro-impl-tparam-only-in-impl.check
+++ b/tests/disabled/macro/run/macro-impl-tparam-only-in-impl.check
diff --git a/tests/pending/run/macro-impl-tparam-only-in-impl.flags b/tests/disabled/macro/run/macro-impl-tparam-only-in-impl.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-impl-tparam-only-in-impl.flags
+++ b/tests/disabled/macro/run/macro-impl-tparam-only-in-impl.flags
diff --git a/tests/pending/run/macro-impl-tparam-only-in-impl/Impls_1.scala b/tests/disabled/macro/run/macro-impl-tparam-only-in-impl/Impls_1.scala
index 705defb18..705defb18 100644
--- a/tests/pending/run/macro-impl-tparam-only-in-impl/Impls_1.scala
+++ b/tests/disabled/macro/run/macro-impl-tparam-only-in-impl/Impls_1.scala
diff --git a/tests/pending/run/macro-impl-tparam-only-in-impl/Macros_Test_2.scala b/tests/disabled/macro/run/macro-impl-tparam-only-in-impl/Macros_Test_2.scala
index b626ce35e..b626ce35e 100644
--- a/tests/pending/run/macro-impl-tparam-only-in-impl/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-impl-tparam-only-in-impl/Macros_Test_2.scala
diff --git a/tests/pending/run/macro-impl-tparam-typetag-is-optional.check b/tests/disabled/macro/run/macro-impl-tparam-typetag-is-optional.check
index b4a0f394c..b4a0f394c 100644
--- a/tests/pending/run/macro-impl-tparam-typetag-is-optional.check
+++ b/tests/disabled/macro/run/macro-impl-tparam-typetag-is-optional.check
diff --git a/tests/pending/run/macro-impl-tparam-typetag-is-optional.flags b/tests/disabled/macro/run/macro-impl-tparam-typetag-is-optional.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-impl-tparam-typetag-is-optional.flags
+++ b/tests/disabled/macro/run/macro-impl-tparam-typetag-is-optional.flags
diff --git a/tests/pending/run/macro-impl-tparam-typetag-is-optional/Impls_1.scala b/tests/disabled/macro/run/macro-impl-tparam-typetag-is-optional/Impls_1.scala
index fc72e7a97..fc72e7a97 100644
--- a/tests/pending/run/macro-impl-tparam-typetag-is-optional/Impls_1.scala
+++ b/tests/disabled/macro/run/macro-impl-tparam-typetag-is-optional/Impls_1.scala
diff --git a/tests/pending/run/macro-impl-tparam-typetag-is-optional/Macros_Test_2.scala b/tests/disabled/macro/run/macro-impl-tparam-typetag-is-optional/Macros_Test_2.scala
index 14154ee03..14154ee03 100644
--- a/tests/pending/run/macro-impl-tparam-typetag-is-optional/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-impl-tparam-typetag-is-optional/Macros_Test_2.scala
diff --git a/tests/pending/run/macro-invalidret-doesnt-conform-to-def-rettype.check b/tests/disabled/macro/run/macro-invalidret-doesnt-conform-to-def-rettype.check
index 1d531f6d8..1d531f6d8 100644
--- a/tests/pending/run/macro-invalidret-doesnt-conform-to-def-rettype.check
+++ b/tests/disabled/macro/run/macro-invalidret-doesnt-conform-to-def-rettype.check
diff --git a/tests/pending/run/macro-invalidret-doesnt-conform-to-def-rettype.flags b/tests/disabled/macro/run/macro-invalidret-doesnt-conform-to-def-rettype.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-invalidret-doesnt-conform-to-def-rettype.flags
+++ b/tests/disabled/macro/run/macro-invalidret-doesnt-conform-to-def-rettype.flags
diff --git a/tests/pending/run/macro-invalidret-doesnt-conform-to-def-rettype/Impls_Macros_1.scala b/tests/disabled/macro/run/macro-invalidret-doesnt-conform-to-def-rettype/Impls_Macros_1.scala
index 603500b59..603500b59 100644
--- a/tests/pending/run/macro-invalidret-doesnt-conform-to-def-rettype/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/macro-invalidret-doesnt-conform-to-def-rettype/Impls_Macros_1.scala
diff --git a/tests/pending/run/macro-invalidret-doesnt-conform-to-def-rettype/Test_2.scala b/tests/disabled/macro/run/macro-invalidret-doesnt-conform-to-def-rettype/Test_2.scala
index dea6e6d62..dea6e6d62 100644
--- a/tests/pending/run/macro-invalidret-doesnt-conform-to-def-rettype/Test_2.scala
+++ b/tests/disabled/macro/run/macro-invalidret-doesnt-conform-to-def-rettype/Test_2.scala
diff --git a/tests/pending/run/macro-invalidret-nontypeable.check b/tests/disabled/macro/run/macro-invalidret-nontypeable.check
index 25cef2c78..25cef2c78 100644
--- a/tests/pending/run/macro-invalidret-nontypeable.check
+++ b/tests/disabled/macro/run/macro-invalidret-nontypeable.check
diff --git a/tests/pending/run/macro-invalidret-nontypeable.flags b/tests/disabled/macro/run/macro-invalidret-nontypeable.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-invalidret-nontypeable.flags
+++ b/tests/disabled/macro/run/macro-invalidret-nontypeable.flags
diff --git a/tests/pending/run/macro-invalidret-nontypeable/Impls_Macros_1.scala b/tests/disabled/macro/run/macro-invalidret-nontypeable/Impls_Macros_1.scala
index b6b961174..b6b961174 100644
--- a/tests/pending/run/macro-invalidret-nontypeable/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/macro-invalidret-nontypeable/Impls_Macros_1.scala
diff --git a/tests/pending/run/macro-invalidret-nontypeable/Test_2.scala b/tests/disabled/macro/run/macro-invalidret-nontypeable/Test_2.scala
index 26de1d9de..26de1d9de 100644
--- a/tests/pending/run/macro-invalidret-nontypeable/Test_2.scala
+++ b/tests/disabled/macro/run/macro-invalidret-nontypeable/Test_2.scala
diff --git a/tests/pending/run/macro-invalidusage-badret.check b/tests/disabled/macro/run/macro-invalidusage-badret.check
index e79550043..e79550043 100644
--- a/tests/pending/run/macro-invalidusage-badret.check
+++ b/tests/disabled/macro/run/macro-invalidusage-badret.check
diff --git a/tests/pending/run/macro-invalidusage-badret.flags b/tests/disabled/macro/run/macro-invalidusage-badret.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-invalidusage-badret.flags
+++ b/tests/disabled/macro/run/macro-invalidusage-badret.flags
diff --git a/tests/pending/run/macro-invalidusage-badret/Impls_Macros_1.scala b/tests/disabled/macro/run/macro-invalidusage-badret/Impls_Macros_1.scala
index 0d4c5755f..0d4c5755f 100644
--- a/tests/pending/run/macro-invalidusage-badret/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/macro-invalidusage-badret/Impls_Macros_1.scala
diff --git a/tests/pending/run/macro-invalidusage-badret/Test_2.scala b/tests/disabled/macro/run/macro-invalidusage-badret/Test_2.scala
index 1d208aeb1..1d208aeb1 100644
--- a/tests/pending/run/macro-invalidusage-badret/Test_2.scala
+++ b/tests/disabled/macro/run/macro-invalidusage-badret/Test_2.scala
diff --git a/tests/pending/run/macro-invalidusage-partialapplication-with-tparams.check b/tests/disabled/macro/run/macro-invalidusage-partialapplication-with-tparams.check
index 6cbcb9e5a..6cbcb9e5a 100644
--- a/tests/pending/run/macro-invalidusage-partialapplication-with-tparams.check
+++ b/tests/disabled/macro/run/macro-invalidusage-partialapplication-with-tparams.check
diff --git a/tests/pending/run/macro-invalidusage-partialapplication-with-tparams.flags b/tests/disabled/macro/run/macro-invalidusage-partialapplication-with-tparams.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-invalidusage-partialapplication-with-tparams.flags
+++ b/tests/disabled/macro/run/macro-invalidusage-partialapplication-with-tparams.flags
diff --git a/tests/pending/run/macro-invalidusage-partialapplication-with-tparams/Impls_Macros_1.scala b/tests/disabled/macro/run/macro-invalidusage-partialapplication-with-tparams/Impls_Macros_1.scala
index 8b5c59bde..8b5c59bde 100644
--- a/tests/pending/run/macro-invalidusage-partialapplication-with-tparams/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/macro-invalidusage-partialapplication-with-tparams/Impls_Macros_1.scala
diff --git a/tests/pending/run/macro-invalidusage-partialapplication-with-tparams/Test_2.scala b/tests/disabled/macro/run/macro-invalidusage-partialapplication-with-tparams/Test_2.scala
index ba763eda5..ba763eda5 100644
--- a/tests/pending/run/macro-invalidusage-partialapplication-with-tparams/Test_2.scala
+++ b/tests/disabled/macro/run/macro-invalidusage-partialapplication-with-tparams/Test_2.scala
diff --git a/tests/pending/run/macro-invalidusage-partialapplication.check b/tests/disabled/macro/run/macro-invalidusage-partialapplication.check
index 6cbcb9e5a..6cbcb9e5a 100644
--- a/tests/pending/run/macro-invalidusage-partialapplication.check
+++ b/tests/disabled/macro/run/macro-invalidusage-partialapplication.check
diff --git a/tests/pending/run/macro-invalidusage-partialapplication.flags b/tests/disabled/macro/run/macro-invalidusage-partialapplication.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-invalidusage-partialapplication.flags
+++ b/tests/disabled/macro/run/macro-invalidusage-partialapplication.flags
diff --git a/tests/pending/run/macro-invalidusage-partialapplication/Impls_Macros_1.scala b/tests/disabled/macro/run/macro-invalidusage-partialapplication/Impls_Macros_1.scala
index 6970b4dd7..6970b4dd7 100644
--- a/tests/pending/run/macro-invalidusage-partialapplication/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/macro-invalidusage-partialapplication/Impls_Macros_1.scala
diff --git a/tests/pending/run/macro-invalidusage-partialapplication/Test_2.scala b/tests/disabled/macro/run/macro-invalidusage-partialapplication/Test_2.scala
index a0b90ee6b..a0b90ee6b 100644
--- a/tests/pending/run/macro-invalidusage-partialapplication/Test_2.scala
+++ b/tests/disabled/macro/run/macro-invalidusage-partialapplication/Test_2.scala
diff --git a/tests/pending/run/macro-openmacros.check b/tests/disabled/macro/run/macro-openmacros.check
index ba0ae3ff4..ba0ae3ff4 100644
--- a/tests/pending/run/macro-openmacros.check
+++ b/tests/disabled/macro/run/macro-openmacros.check
diff --git a/tests/pending/run/macro-openmacros.flags b/tests/disabled/macro/run/macro-openmacros.flags
index 2433c055a..2433c055a 100644
--- a/tests/pending/run/macro-openmacros.flags
+++ b/tests/disabled/macro/run/macro-openmacros.flags
diff --git a/tests/pending/run/macro-openmacros/Impls_Macros_1.scala b/tests/disabled/macro/run/macro-openmacros/Impls_Macros_1.scala
index b60ca90d9..b60ca90d9 100644
--- a/tests/pending/run/macro-openmacros/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/macro-openmacros/Impls_Macros_1.scala
diff --git a/tests/pending/run/macro-openmacros/Test_2.scala b/tests/disabled/macro/run/macro-openmacros/Test_2.scala
index d75fbd0db..d75fbd0db 100644
--- a/tests/pending/run/macro-openmacros/Test_2.scala
+++ b/tests/disabled/macro/run/macro-openmacros/Test_2.scala
diff --git a/tests/pending/run/macro-parse-position-malformed.check b/tests/disabled/macro/run/macro-parse-position-malformed.check
index 00f0bc5b6..00f0bc5b6 100644
--- a/tests/pending/run/macro-parse-position-malformed.check
+++ b/tests/disabled/macro/run/macro-parse-position-malformed.check
diff --git a/tests/pending/run/macro-parse-position-malformed/Impls_Macros_1.scala b/tests/disabled/macro/run/macro-parse-position-malformed/Impls_Macros_1.scala
index b623d8820..b623d8820 100644
--- a/tests/pending/run/macro-parse-position-malformed/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/macro-parse-position-malformed/Impls_Macros_1.scala
diff --git a/tests/pending/run/macro-parse-position-malformed/Test_2.scala b/tests/disabled/macro/run/macro-parse-position-malformed/Test_2.scala
index 1b04d2af2..1b04d2af2 100644
--- a/tests/pending/run/macro-parse-position-malformed/Test_2.scala
+++ b/tests/disabled/macro/run/macro-parse-position-malformed/Test_2.scala
diff --git a/tests/pending/run/macro-parse-position.check b/tests/disabled/macro/run/macro-parse-position.check
index 3da032069..3da032069 100644
--- a/tests/pending/run/macro-parse-position.check
+++ b/tests/disabled/macro/run/macro-parse-position.check
diff --git a/tests/pending/run/macro-parse-position.flags b/tests/disabled/macro/run/macro-parse-position.flags
index ea7fc37e1..ea7fc37e1 100644
--- a/tests/pending/run/macro-parse-position.flags
+++ b/tests/disabled/macro/run/macro-parse-position.flags
diff --git a/tests/pending/run/macro-parse-position/Impls_Macros_1.scala b/tests/disabled/macro/run/macro-parse-position/Impls_Macros_1.scala
index dd20fd291..dd20fd291 100644
--- a/tests/pending/run/macro-parse-position/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/macro-parse-position/Impls_Macros_1.scala
diff --git a/tests/pending/run/macro-parse-position/Test_2.scala b/tests/disabled/macro/run/macro-parse-position/Test_2.scala
index 1b04d2af2..1b04d2af2 100644
--- a/tests/pending/run/macro-parse-position/Test_2.scala
+++ b/tests/disabled/macro/run/macro-parse-position/Test_2.scala
diff --git a/tests/pending/run/macro-quasiinvalidbody-c.check b/tests/disabled/macro/run/macro-quasiinvalidbody-c.check
index f70d7bba4..f70d7bba4 100644
--- a/tests/pending/run/macro-quasiinvalidbody-c.check
+++ b/tests/disabled/macro/run/macro-quasiinvalidbody-c.check
diff --git a/tests/pending/run/macro-quasiinvalidbody-c.flags b/tests/disabled/macro/run/macro-quasiinvalidbody-c.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-quasiinvalidbody-c.flags
+++ b/tests/disabled/macro/run/macro-quasiinvalidbody-c.flags
diff --git a/tests/pending/run/macro-quasiinvalidbody-c/Impls_Macros_1.scala b/tests/disabled/macro/run/macro-quasiinvalidbody-c/Impls_Macros_1.scala
index df189b70d..df189b70d 100644
--- a/tests/pending/run/macro-quasiinvalidbody-c/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/macro-quasiinvalidbody-c/Impls_Macros_1.scala
diff --git a/tests/pending/run/macro-quasiinvalidbody-c/Test_2.scala b/tests/disabled/macro/run/macro-quasiinvalidbody-c/Test_2.scala
index 91053843d..91053843d 100644
--- a/tests/pending/run/macro-quasiinvalidbody-c/Test_2.scala
+++ b/tests/disabled/macro/run/macro-quasiinvalidbody-c/Test_2.scala
diff --git a/tests/pending/run/macro-quasiquotes.check b/tests/disabled/macro/run/macro-quasiquotes.check
index 94ebaf900..94ebaf900 100644
--- a/tests/pending/run/macro-quasiquotes.check
+++ b/tests/disabled/macro/run/macro-quasiquotes.check
diff --git a/tests/pending/run/macro-quasiquotes/Macros_1.scala b/tests/disabled/macro/run/macro-quasiquotes/Macros_1.scala
index 764542a87..764542a87 100644
--- a/tests/pending/run/macro-quasiquotes/Macros_1.scala
+++ b/tests/disabled/macro/run/macro-quasiquotes/Macros_1.scala
diff --git a/tests/pending/run/macro-quasiquotes/Test_2.scala b/tests/disabled/macro/run/macro-quasiquotes/Test_2.scala
index b7d203197..b7d203197 100644
--- a/tests/pending/run/macro-quasiquotes/Test_2.scala
+++ b/tests/disabled/macro/run/macro-quasiquotes/Test_2.scala
diff --git a/tests/pending/run/macro-range.check b/tests/disabled/macro/run/macro-range.check
index 071939893..071939893 100644
--- a/tests/pending/run/macro-range.check
+++ b/tests/disabled/macro/run/macro-range.check
diff --git a/tests/pending/run/macro-range.flags b/tests/disabled/macro/run/macro-range.flags
index 5e5dd6ce7..5e5dd6ce7 100644
--- a/tests/pending/run/macro-range.flags
+++ b/tests/disabled/macro/run/macro-range.flags
diff --git a/tests/pending/run/macro-range/Common_1.scala b/tests/disabled/macro/run/macro-range/Common_1.scala
index 35d2efd76..35d2efd76 100644
--- a/tests/pending/run/macro-range/Common_1.scala
+++ b/tests/disabled/macro/run/macro-range/Common_1.scala
diff --git a/tests/pending/run/macro-range/Expansion_Impossible_2.scala b/tests/disabled/macro/run/macro-range/Expansion_Impossible_2.scala
index b3c2fa348..b3c2fa348 100644
--- a/tests/pending/run/macro-range/Expansion_Impossible_2.scala
+++ b/tests/disabled/macro/run/macro-range/Expansion_Impossible_2.scala
diff --git a/tests/pending/run/macro-range/Expansion_Possible_3.scala b/tests/disabled/macro/run/macro-range/Expansion_Possible_3.scala
index b1fbba765..b1fbba765 100644
--- a/tests/pending/run/macro-range/Expansion_Possible_3.scala
+++ b/tests/disabled/macro/run/macro-range/Expansion_Possible_3.scala
diff --git a/tests/pending/run/macro-rangepos-args.check b/tests/disabled/macro/run/macro-rangepos-args.check
index d779505c6..d779505c6 100644
--- a/tests/pending/run/macro-rangepos-args.check
+++ b/tests/disabled/macro/run/macro-rangepos-args.check
diff --git a/tests/pending/run/macro-rangepos-args.flags b/tests/disabled/macro/run/macro-rangepos-args.flags
index fcf951d90..fcf951d90 100644
--- a/tests/pending/run/macro-rangepos-args.flags
+++ b/tests/disabled/macro/run/macro-rangepos-args.flags
diff --git a/tests/pending/run/macro-rangepos-args/Macros_1.scala b/tests/disabled/macro/run/macro-rangepos-args/Macros_1.scala
index 97b938613..97b938613 100644
--- a/tests/pending/run/macro-rangepos-args/Macros_1.scala
+++ b/tests/disabled/macro/run/macro-rangepos-args/Macros_1.scala
diff --git a/tests/pending/run/macro-rangepos-args/Test_2.scala b/tests/disabled/macro/run/macro-rangepos-args/Test_2.scala
index 936b945c7..936b945c7 100644
--- a/tests/pending/run/macro-rangepos-args/Test_2.scala
+++ b/tests/disabled/macro/run/macro-rangepos-args/Test_2.scala
diff --git a/tests/pending/run/macro-rangepos-subpatterns.check b/tests/disabled/macro/run/macro-rangepos-subpatterns.check
index 760e15d01..760e15d01 100644
--- a/tests/pending/run/macro-rangepos-subpatterns.check
+++ b/tests/disabled/macro/run/macro-rangepos-subpatterns.check
diff --git a/tests/pending/run/macro-rangepos-subpatterns.flags b/tests/disabled/macro/run/macro-rangepos-subpatterns.flags
index fcf951d90..fcf951d90 100644
--- a/tests/pending/run/macro-rangepos-subpatterns.flags
+++ b/tests/disabled/macro/run/macro-rangepos-subpatterns.flags
diff --git a/tests/pending/run/macro-rangepos-subpatterns/Macros_1.scala b/tests/disabled/macro/run/macro-rangepos-subpatterns/Macros_1.scala
index 0f3086234..0f3086234 100644
--- a/tests/pending/run/macro-rangepos-subpatterns/Macros_1.scala
+++ b/tests/disabled/macro/run/macro-rangepos-subpatterns/Macros_1.scala
diff --git a/tests/pending/run/macro-rangepos-subpatterns/Test_2.scala b/tests/disabled/macro/run/macro-rangepos-subpatterns/Test_2.scala
index b9b308cea..b9b308cea 100644
--- a/tests/pending/run/macro-rangepos-subpatterns/Test_2.scala
+++ b/tests/disabled/macro/run/macro-rangepos-subpatterns/Test_2.scala
diff --git a/tests/pending/run/macro-reflective-ma-normal-mdmi.check b/tests/disabled/macro/run/macro-reflective-ma-normal-mdmi.check
index ac4213d6e..ac4213d6e 100644
--- a/tests/pending/run/macro-reflective-ma-normal-mdmi.check
+++ b/tests/disabled/macro/run/macro-reflective-ma-normal-mdmi.check
diff --git a/tests/pending/run/macro-reflective-ma-normal-mdmi.flags b/tests/disabled/macro/run/macro-reflective-ma-normal-mdmi.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-reflective-ma-normal-mdmi.flags
+++ b/tests/disabled/macro/run/macro-reflective-ma-normal-mdmi.flags
diff --git a/tests/pending/run/macro-reflective-ma-normal-mdmi/Impls_Macros_1.scala b/tests/disabled/macro/run/macro-reflective-ma-normal-mdmi/Impls_Macros_1.scala
index e964da210..e964da210 100644
--- a/tests/pending/run/macro-reflective-ma-normal-mdmi/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/macro-reflective-ma-normal-mdmi/Impls_Macros_1.scala
diff --git a/tests/pending/run/macro-reflective-ma-normal-mdmi/Test_2.scala b/tests/disabled/macro/run/macro-reflective-ma-normal-mdmi/Test_2.scala
index b8d969b83..b8d969b83 100644
--- a/tests/pending/run/macro-reflective-ma-normal-mdmi/Test_2.scala
+++ b/tests/disabled/macro/run/macro-reflective-ma-normal-mdmi/Test_2.scala
diff --git a/tests/pending/run/macro-reflective-mamd-normal-mi.check b/tests/disabled/macro/run/macro-reflective-mamd-normal-mi.check
index 920a13966..920a13966 100644
--- a/tests/pending/run/macro-reflective-mamd-normal-mi.check
+++ b/tests/disabled/macro/run/macro-reflective-mamd-normal-mi.check
diff --git a/tests/pending/run/macro-reflective-mamd-normal-mi/Impls_1.scala b/tests/disabled/macro/run/macro-reflective-mamd-normal-mi/Impls_1.scala
index e62db783b..e62db783b 100644
--- a/tests/pending/run/macro-reflective-mamd-normal-mi/Impls_1.scala
+++ b/tests/disabled/macro/run/macro-reflective-mamd-normal-mi/Impls_1.scala
diff --git a/tests/pending/run/macro-reflective-mamd-normal-mi/Macros_Test_2.scala b/tests/disabled/macro/run/macro-reflective-mamd-normal-mi/Macros_Test_2.scala
index 0b867e787..0b867e787 100644
--- a/tests/pending/run/macro-reflective-mamd-normal-mi/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-reflective-mamd-normal-mi/Macros_Test_2.scala
diff --git a/tests/pending/run/macro-reify-basic.check b/tests/disabled/macro/run/macro-reify-basic.check
index 3b18e512d..3b18e512d 100644
--- a/tests/pending/run/macro-reify-basic.check
+++ b/tests/disabled/macro/run/macro-reify-basic.check
diff --git a/tests/pending/run/macro-reify-basic.flags b/tests/disabled/macro/run/macro-reify-basic.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-reify-basic.flags
+++ b/tests/disabled/macro/run/macro-reify-basic.flags
diff --git a/tests/pending/run/macro-reify-basic/Macros_1.scala b/tests/disabled/macro/run/macro-reify-basic/Macros_1.scala
index 1cf2a8a40..1cf2a8a40 100644
--- a/tests/pending/run/macro-reify-basic/Macros_1.scala
+++ b/tests/disabled/macro/run/macro-reify-basic/Macros_1.scala
diff --git a/tests/pending/run/macro-reify-basic/Test_2.scala b/tests/disabled/macro/run/macro-reify-basic/Test_2.scala
index 26b2c7d9f..26b2c7d9f 100644
--- a/tests/pending/run/macro-reify-basic/Test_2.scala
+++ b/tests/disabled/macro/run/macro-reify-basic/Test_2.scala
diff --git a/tests/pending/run/macro-reify-chained1/Impls_Macros_1.scala b/tests/disabled/macro/run/macro-reify-chained1/Impls_Macros_1.scala
index 7f877b272..7f877b272 100644
--- a/tests/pending/run/macro-reify-chained1/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/macro-reify-chained1/Impls_Macros_1.scala
diff --git a/tests/pending/run/macro-reify-chained1/Test_2.scala b/tests/disabled/macro/run/macro-reify-chained1/Test_2.scala
index 01a021893..01a021893 100644
--- a/tests/pending/run/macro-reify-chained1/Test_2.scala
+++ b/tests/disabled/macro/run/macro-reify-chained1/Test_2.scala
diff --git a/tests/pending/run/macro-reify-chained2/Impls_Macros_1.scala b/tests/disabled/macro/run/macro-reify-chained2/Impls_Macros_1.scala
index 965b19104..965b19104 100644
--- a/tests/pending/run/macro-reify-chained2/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/macro-reify-chained2/Impls_Macros_1.scala
diff --git a/tests/pending/run/macro-reify-chained2/Test_2.scala b/tests/disabled/macro/run/macro-reify-chained2/Test_2.scala
index 01a021893..01a021893 100644
--- a/tests/pending/run/macro-reify-chained2/Test_2.scala
+++ b/tests/disabled/macro/run/macro-reify-chained2/Test_2.scala
diff --git a/tests/pending/run/macro-reify-freevars.check b/tests/disabled/macro/run/macro-reify-freevars.check
index f618e307b..f618e307b 100644
--- a/tests/pending/run/macro-reify-freevars.check
+++ b/tests/disabled/macro/run/macro-reify-freevars.check
diff --git a/tests/pending/run/macro-reify-freevars.flags b/tests/disabled/macro/run/macro-reify-freevars.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-reify-freevars.flags
+++ b/tests/disabled/macro/run/macro-reify-freevars.flags
diff --git a/tests/pending/run/macro-reify-freevars/Macros_1.scala b/tests/disabled/macro/run/macro-reify-freevars/Macros_1.scala
index 912f602c6..912f602c6 100644
--- a/tests/pending/run/macro-reify-freevars/Macros_1.scala
+++ b/tests/disabled/macro/run/macro-reify-freevars/Macros_1.scala
diff --git a/tests/pending/run/macro-reify-freevars/Test_2.scala b/tests/disabled/macro/run/macro-reify-freevars/Test_2.scala
index 11c8128cd..11c8128cd 100644
--- a/tests/pending/run/macro-reify-freevars/Test_2.scala
+++ b/tests/disabled/macro/run/macro-reify-freevars/Test_2.scala
diff --git a/tests/pending/run/macro-reify-nested-a1/Impls_Macros_1.scala b/tests/disabled/macro/run/macro-reify-nested-a1/Impls_Macros_1.scala
index 7f877b272..7f877b272 100644
--- a/tests/pending/run/macro-reify-nested-a1/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/macro-reify-nested-a1/Impls_Macros_1.scala
diff --git a/tests/pending/run/macro-reify-nested-a1/Test_2.scala b/tests/disabled/macro/run/macro-reify-nested-a1/Test_2.scala
index 37282cad7..37282cad7 100644
--- a/tests/pending/run/macro-reify-nested-a1/Test_2.scala
+++ b/tests/disabled/macro/run/macro-reify-nested-a1/Test_2.scala
diff --git a/tests/pending/run/macro-reify-nested-a2/Impls_Macros_1.scala b/tests/disabled/macro/run/macro-reify-nested-a2/Impls_Macros_1.scala
index 965b19104..965b19104 100644
--- a/tests/pending/run/macro-reify-nested-a2/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/macro-reify-nested-a2/Impls_Macros_1.scala
diff --git a/tests/pending/run/macro-reify-nested-a2/Test_2.scala b/tests/disabled/macro/run/macro-reify-nested-a2/Test_2.scala
index 37282cad7..37282cad7 100644
--- a/tests/pending/run/macro-reify-nested-a2/Test_2.scala
+++ b/tests/disabled/macro/run/macro-reify-nested-a2/Test_2.scala
diff --git a/tests/pending/run/macro-reify-nested-b1/Impls_Macros_1.scala b/tests/disabled/macro/run/macro-reify-nested-b1/Impls_Macros_1.scala
index 7f877b272..7f877b272 100644
--- a/tests/pending/run/macro-reify-nested-b1/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/macro-reify-nested-b1/Impls_Macros_1.scala
diff --git a/tests/pending/run/macro-reify-nested-b1/Test_2.scala b/tests/disabled/macro/run/macro-reify-nested-b1/Test_2.scala
index b9d6846dc..b9d6846dc 100644
--- a/tests/pending/run/macro-reify-nested-b1/Test_2.scala
+++ b/tests/disabled/macro/run/macro-reify-nested-b1/Test_2.scala
diff --git a/tests/pending/run/macro-reify-nested-b2/Impls_Macros_1.scala b/tests/disabled/macro/run/macro-reify-nested-b2/Impls_Macros_1.scala
index 965b19104..965b19104 100644
--- a/tests/pending/run/macro-reify-nested-b2/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/macro-reify-nested-b2/Impls_Macros_1.scala
diff --git a/tests/pending/run/macro-reify-nested-b2/Test_2.scala b/tests/disabled/macro/run/macro-reify-nested-b2/Test_2.scala
index b9d6846dc..b9d6846dc 100644
--- a/tests/pending/run/macro-reify-nested-b2/Test_2.scala
+++ b/tests/disabled/macro/run/macro-reify-nested-b2/Test_2.scala
diff --git a/tests/pending/run/macro-reify-ref-to-packageless.check b/tests/disabled/macro/run/macro-reify-ref-to-packageless.check
index d81cc0710..d81cc0710 100644
--- a/tests/pending/run/macro-reify-ref-to-packageless.check
+++ b/tests/disabled/macro/run/macro-reify-ref-to-packageless.check
diff --git a/tests/pending/run/macro-reify-ref-to-packageless.flags b/tests/disabled/macro/run/macro-reify-ref-to-packageless.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-reify-ref-to-packageless.flags
+++ b/tests/disabled/macro/run/macro-reify-ref-to-packageless.flags
diff --git a/tests/pending/run/macro-reify-ref-to-packageless/Impls_1.scala b/tests/disabled/macro/run/macro-reify-ref-to-packageless/Impls_1.scala
index 38ec6f022..38ec6f022 100644
--- a/tests/pending/run/macro-reify-ref-to-packageless/Impls_1.scala
+++ b/tests/disabled/macro/run/macro-reify-ref-to-packageless/Impls_1.scala
diff --git a/tests/pending/run/macro-reify-ref-to-packageless/Test_2.scala b/tests/disabled/macro/run/macro-reify-ref-to-packageless/Test_2.scala
index ff5b60a6a..ff5b60a6a 100644
--- a/tests/pending/run/macro-reify-ref-to-packageless/Test_2.scala
+++ b/tests/disabled/macro/run/macro-reify-ref-to-packageless/Test_2.scala
diff --git a/tests/pending/run/macro-reify-splice-outside-reify.check b/tests/disabled/macro/run/macro-reify-splice-outside-reify.check
index d81cc0710..d81cc0710 100644
--- a/tests/pending/run/macro-reify-splice-outside-reify.check
+++ b/tests/disabled/macro/run/macro-reify-splice-outside-reify.check
diff --git a/tests/pending/run/macro-reify-splice-outside-reify.flags b/tests/disabled/macro/run/macro-reify-splice-outside-reify.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-reify-splice-outside-reify.flags
+++ b/tests/disabled/macro/run/macro-reify-splice-outside-reify.flags
diff --git a/tests/pending/run/macro-reify-splice-outside-reify/Impls_Macros_1.scala b/tests/disabled/macro/run/macro-reify-splice-outside-reify/Impls_Macros_1.scala
index f038d8714..f038d8714 100644
--- a/tests/pending/run/macro-reify-splice-outside-reify/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/macro-reify-splice-outside-reify/Impls_Macros_1.scala
diff --git a/tests/pending/run/macro-reify-splice-outside-reify/Test_2.scala b/tests/disabled/macro/run/macro-reify-splice-outside-reify/Test_2.scala
index f99d40dad..f99d40dad 100644
--- a/tests/pending/run/macro-reify-splice-outside-reify/Test_2.scala
+++ b/tests/disabled/macro/run/macro-reify-splice-outside-reify/Test_2.scala
diff --git a/tests/pending/run/macro-reify-staticXXX.check b/tests/disabled/macro/run/macro-reify-staticXXX.check
index 2894fa584..2894fa584 100644
--- a/tests/pending/run/macro-reify-staticXXX.check
+++ b/tests/disabled/macro/run/macro-reify-staticXXX.check
diff --git a/tests/pending/run/macro-reify-staticXXX.flags b/tests/disabled/macro/run/macro-reify-staticXXX.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-reify-staticXXX.flags
+++ b/tests/disabled/macro/run/macro-reify-staticXXX.flags
diff --git a/tests/pending/run/macro-reify-staticXXX/Macros_1.scala b/tests/disabled/macro/run/macro-reify-staticXXX/Macros_1.scala
index 2993218bb..2993218bb 100644
--- a/tests/pending/run/macro-reify-staticXXX/Macros_1.scala
+++ b/tests/disabled/macro/run/macro-reify-staticXXX/Macros_1.scala
diff --git a/tests/pending/run/macro-reify-staticXXX/Test_2.scala b/tests/disabled/macro/run/macro-reify-staticXXX/Test_2.scala
index 4c02e26f6..4c02e26f6 100644
--- a/tests/pending/run/macro-reify-staticXXX/Test_2.scala
+++ b/tests/disabled/macro/run/macro-reify-staticXXX/Test_2.scala
diff --git a/tests/pending/run/macro-reify-tagful-a.check b/tests/disabled/macro/run/macro-reify-tagful-a.check
index 3f4c71999..3f4c71999 100644
--- a/tests/pending/run/macro-reify-tagful-a.check
+++ b/tests/disabled/macro/run/macro-reify-tagful-a.check
diff --git a/tests/pending/run/macro-reify-tagful-a.flags b/tests/disabled/macro/run/macro-reify-tagful-a.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-reify-tagful-a.flags
+++ b/tests/disabled/macro/run/macro-reify-tagful-a.flags
diff --git a/tests/pending/run/macro-reify-tagful-a/Macros_1.scala b/tests/disabled/macro/run/macro-reify-tagful-a/Macros_1.scala
index 6f061fd26..6f061fd26 100644
--- a/tests/pending/run/macro-reify-tagful-a/Macros_1.scala
+++ b/tests/disabled/macro/run/macro-reify-tagful-a/Macros_1.scala
diff --git a/tests/pending/run/macro-reify-tagful-a/Test_2.scala b/tests/disabled/macro/run/macro-reify-tagful-a/Test_2.scala
index 5095ddcaa..5095ddcaa 100644
--- a/tests/pending/run/macro-reify-tagful-a/Test_2.scala
+++ b/tests/disabled/macro/run/macro-reify-tagful-a/Test_2.scala
diff --git a/tests/pending/run/macro-reify-tagless-a.check b/tests/disabled/macro/run/macro-reify-tagless-a.check
index d160e8043..d160e8043 100644
--- a/tests/pending/run/macro-reify-tagless-a.check
+++ b/tests/disabled/macro/run/macro-reify-tagless-a.check
diff --git a/tests/pending/run/macro-reify-tagless-a.flags b/tests/disabled/macro/run/macro-reify-tagless-a.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-reify-tagless-a.flags
+++ b/tests/disabled/macro/run/macro-reify-tagless-a.flags
diff --git a/tests/pending/run/macro-reify-tagless-a/Impls_Macros_1.scala b/tests/disabled/macro/run/macro-reify-tagless-a/Impls_Macros_1.scala
index faac3e3a3..faac3e3a3 100644
--- a/tests/pending/run/macro-reify-tagless-a/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/macro-reify-tagless-a/Impls_Macros_1.scala
diff --git a/tests/pending/run/macro-reify-tagless-a/Test_2.scala b/tests/disabled/macro/run/macro-reify-tagless-a/Test_2.scala
index af882664d..af882664d 100644
--- a/tests/pending/run/macro-reify-tagless-a/Test_2.scala
+++ b/tests/disabled/macro/run/macro-reify-tagless-a/Test_2.scala
diff --git a/tests/pending/run/macro-reify-type.check b/tests/disabled/macro/run/macro-reify-type.check
index ea5e70e10..ea5e70e10 100644
--- a/tests/pending/run/macro-reify-type.check
+++ b/tests/disabled/macro/run/macro-reify-type.check
diff --git a/tests/pending/run/macro-reify-type.flags b/tests/disabled/macro/run/macro-reify-type.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-reify-type.flags
+++ b/tests/disabled/macro/run/macro-reify-type.flags
diff --git a/tests/pending/run/macro-reify-type/Macros_1.scala b/tests/disabled/macro/run/macro-reify-type/Macros_1.scala
index c38cf8aa5..c38cf8aa5 100644
--- a/tests/pending/run/macro-reify-type/Macros_1.scala
+++ b/tests/disabled/macro/run/macro-reify-type/Macros_1.scala
diff --git a/tests/pending/run/macro-reify-type/Test_2.scala b/tests/disabled/macro/run/macro-reify-type/Test_2.scala
index c9e56d718..c9e56d718 100644
--- a/tests/pending/run/macro-reify-type/Test_2.scala
+++ b/tests/disabled/macro/run/macro-reify-type/Test_2.scala
diff --git a/tests/pending/run/macro-reify-typetag-notypeparams.check b/tests/disabled/macro/run/macro-reify-typetag-notypeparams.check
index 7732c10d7..7732c10d7 100644
--- a/tests/pending/run/macro-reify-typetag-notypeparams.check
+++ b/tests/disabled/macro/run/macro-reify-typetag-notypeparams.check
diff --git a/tests/pending/run/macro-reify-typetag-notypeparams/Test.scala b/tests/disabled/macro/run/macro-reify-typetag-notypeparams/Test.scala
index 1eff6e93f..1eff6e93f 100644
--- a/tests/pending/run/macro-reify-typetag-notypeparams/Test.scala
+++ b/tests/disabled/macro/run/macro-reify-typetag-notypeparams/Test.scala
diff --git a/tests/pending/run/macro-reify-typetag-typeparams-tags.check b/tests/disabled/macro/run/macro-reify-typetag-typeparams-tags.check
index 7732c10d7..7732c10d7 100644
--- a/tests/pending/run/macro-reify-typetag-typeparams-tags.check
+++ b/tests/disabled/macro/run/macro-reify-typetag-typeparams-tags.check
diff --git a/tests/pending/run/macro-reify-typetag-typeparams-tags/Test.scala b/tests/disabled/macro/run/macro-reify-typetag-typeparams-tags/Test.scala
index 4540bb6b3..4540bb6b3 100644
--- a/tests/pending/run/macro-reify-typetag-typeparams-tags/Test.scala
+++ b/tests/disabled/macro/run/macro-reify-typetag-typeparams-tags/Test.scala
diff --git a/tests/pending/run/macro-reify-unreify.check b/tests/disabled/macro/run/macro-reify-unreify.check
index 7a6d53c47..7a6d53c47 100644
--- a/tests/pending/run/macro-reify-unreify.check
+++ b/tests/disabled/macro/run/macro-reify-unreify.check
diff --git a/tests/pending/run/macro-reify-unreify.flags b/tests/disabled/macro/run/macro-reify-unreify.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-reify-unreify.flags
+++ b/tests/disabled/macro/run/macro-reify-unreify.flags
diff --git a/tests/pending/run/macro-reify-unreify/Macros_1.scala b/tests/disabled/macro/run/macro-reify-unreify/Macros_1.scala
index d92dfa3e2..d92dfa3e2 100644
--- a/tests/pending/run/macro-reify-unreify/Macros_1.scala
+++ b/tests/disabled/macro/run/macro-reify-unreify/Macros_1.scala
diff --git a/tests/pending/run/macro-reify-unreify/Test_2.scala b/tests/disabled/macro/run/macro-reify-unreify/Test_2.scala
index 26b2c7d9f..26b2c7d9f 100644
--- a/tests/pending/run/macro-reify-unreify/Test_2.scala
+++ b/tests/disabled/macro/run/macro-reify-unreify/Test_2.scala
diff --git a/tests/pending/run/macro-repl-basic.check b/tests/disabled/macro/run/macro-repl-basic.check
index fab03d155..fab03d155 100644
--- a/tests/pending/run/macro-repl-basic.check
+++ b/tests/disabled/macro/run/macro-repl-basic.check
diff --git a/tests/pending/run/macro-repl-basic.scala b/tests/disabled/macro/run/macro-repl-basic.scala
index 217f3bc0e..217f3bc0e 100644
--- a/tests/pending/run/macro-repl-basic.scala
+++ b/tests/disabled/macro/run/macro-repl-basic.scala
diff --git a/tests/pending/run/macro-repl-dontexpand.check b/tests/disabled/macro/run/macro-repl-dontexpand.check
index 6ecc9245f..6ecc9245f 100644
--- a/tests/pending/run/macro-repl-dontexpand.check
+++ b/tests/disabled/macro/run/macro-repl-dontexpand.check
diff --git a/tests/pending/run/macro-repl-dontexpand.scala b/tests/disabled/macro/run/macro-repl-dontexpand.scala
index 920f40084..920f40084 100644
--- a/tests/pending/run/macro-repl-dontexpand.scala
+++ b/tests/disabled/macro/run/macro-repl-dontexpand.scala
diff --git a/tests/pending/run/macro-settings.check b/tests/disabled/macro/run/macro-settings.check
index 050d53cdb..050d53cdb 100644
--- a/tests/pending/run/macro-settings.check
+++ b/tests/disabled/macro/run/macro-settings.check
diff --git a/tests/pending/run/macro-settings.flags b/tests/disabled/macro/run/macro-settings.flags
index 15479e30b..15479e30b 100644
--- a/tests/pending/run/macro-settings.flags
+++ b/tests/disabled/macro/run/macro-settings.flags
diff --git a/tests/pending/run/macro-settings/Impls_Macros_1.scala b/tests/disabled/macro/run/macro-settings/Impls_Macros_1.scala
index 851a98720..851a98720 100644
--- a/tests/pending/run/macro-settings/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/macro-settings/Impls_Macros_1.scala
diff --git a/tests/pending/run/macro-settings/Test_2.scala b/tests/disabled/macro/run/macro-settings/Test_2.scala
index 0fc472aa6..0fc472aa6 100644
--- a/tests/pending/run/macro-settings/Test_2.scala
+++ b/tests/disabled/macro/run/macro-settings/Test_2.scala
diff --git a/tests/pending/run/macro-sip19-revised.check b/tests/disabled/macro/run/macro-sip19-revised.check
index 86c3d819b..86c3d819b 100644
--- a/tests/pending/run/macro-sip19-revised.check
+++ b/tests/disabled/macro/run/macro-sip19-revised.check
diff --git a/tests/pending/run/macro-sip19-revised.flags b/tests/disabled/macro/run/macro-sip19-revised.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-sip19-revised.flags
+++ b/tests/disabled/macro/run/macro-sip19-revised.flags
diff --git a/tests/pending/run/macro-sip19-revised/Impls_Macros_1.scala b/tests/disabled/macro/run/macro-sip19-revised/Impls_Macros_1.scala
index ded4d85cf..ded4d85cf 100644
--- a/tests/pending/run/macro-sip19-revised/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/macro-sip19-revised/Impls_Macros_1.scala
diff --git a/tests/pending/run/macro-sip19-revised/Test_2.scala b/tests/disabled/macro/run/macro-sip19-revised/Test_2.scala
index 483665ae4..483665ae4 100644
--- a/tests/pending/run/macro-sip19-revised/Test_2.scala
+++ b/tests/disabled/macro/run/macro-sip19-revised/Test_2.scala
diff --git a/tests/pending/run/macro-sip19.check b/tests/disabled/macro/run/macro-sip19.check
index 07cfd8c1e..07cfd8c1e 100644
--- a/tests/pending/run/macro-sip19.check
+++ b/tests/disabled/macro/run/macro-sip19.check
diff --git a/tests/pending/run/macro-sip19.flags b/tests/disabled/macro/run/macro-sip19.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-sip19.flags
+++ b/tests/disabled/macro/run/macro-sip19.flags
diff --git a/tests/pending/run/macro-sip19/Impls_Macros_1.scala b/tests/disabled/macro/run/macro-sip19/Impls_Macros_1.scala
index f66ab7147..f66ab7147 100644
--- a/tests/pending/run/macro-sip19/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/macro-sip19/Impls_Macros_1.scala
diff --git a/tests/pending/run/macro-sip19/Test_2.scala b/tests/disabled/macro/run/macro-sip19/Test_2.scala
index 0255f1381..0255f1381 100644
--- a/tests/pending/run/macro-sip19/Test_2.scala
+++ b/tests/disabled/macro/run/macro-sip19/Test_2.scala
diff --git a/tests/pending/run/macro-subpatterns.check b/tests/disabled/macro/run/macro-subpatterns.check
index 4997146cf..4997146cf 100644
--- a/tests/pending/run/macro-subpatterns.check
+++ b/tests/disabled/macro/run/macro-subpatterns.check
diff --git a/tests/pending/run/macro-subpatterns/Macro_1.scala b/tests/disabled/macro/run/macro-subpatterns/Macro_1.scala
index e009e411a..e009e411a 100644
--- a/tests/pending/run/macro-subpatterns/Macro_1.scala
+++ b/tests/disabled/macro/run/macro-subpatterns/Macro_1.scala
diff --git a/tests/pending/run/macro-subpatterns/Test_2.scala b/tests/disabled/macro/run/macro-subpatterns/Test_2.scala
index b19bd9b9b..b19bd9b9b 100644
--- a/tests/pending/run/macro-subpatterns/Test_2.scala
+++ b/tests/disabled/macro/run/macro-subpatterns/Test_2.scala
diff --git a/tests/pending/run/macro-system-properties.check b/tests/disabled/macro/run/macro-system-properties.check
index e2e2bd32b..e2e2bd32b 100644
--- a/tests/pending/run/macro-system-properties.check
+++ b/tests/disabled/macro/run/macro-system-properties.check
diff --git a/tests/pending/run/macro-system-properties.scala b/tests/disabled/macro/run/macro-system-properties.scala
index db88eb7df..db88eb7df 100644
--- a/tests/pending/run/macro-system-properties.scala
+++ b/tests/disabled/macro/run/macro-system-properties.scala
diff --git a/tests/pending/run/macro-term-declared-in-annotation.check b/tests/disabled/macro/run/macro-term-declared-in-annotation.check
index 7658ad2c2..7658ad2c2 100644
--- a/tests/pending/run/macro-term-declared-in-annotation.check
+++ b/tests/disabled/macro/run/macro-term-declared-in-annotation.check
diff --git a/tests/pending/run/macro-term-declared-in-annotation.flags b/tests/disabled/macro/run/macro-term-declared-in-annotation.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-term-declared-in-annotation.flags
+++ b/tests/disabled/macro/run/macro-term-declared-in-annotation.flags
diff --git a/tests/pending/run/macro-term-declared-in-annotation/Impls_1.scala b/tests/disabled/macro/run/macro-term-declared-in-annotation/Impls_1.scala
index c4bcfbc1b..c4bcfbc1b 100644
--- a/tests/pending/run/macro-term-declared-in-annotation/Impls_1.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-annotation/Impls_1.scala
diff --git a/tests/pending/run/macro-term-declared-in-annotation/Macros_2.scala b/tests/disabled/macro/run/macro-term-declared-in-annotation/Macros_2.scala
index 40d71c62f..40d71c62f 100644
--- a/tests/pending/run/macro-term-declared-in-annotation/Macros_2.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-annotation/Macros_2.scala
diff --git a/tests/pending/run/macro-term-declared-in-annotation/Test_3.scala b/tests/disabled/macro/run/macro-term-declared-in-annotation/Test_3.scala
index 322ef9eb1..322ef9eb1 100644
--- a/tests/pending/run/macro-term-declared-in-annotation/Test_3.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-annotation/Test_3.scala
diff --git a/tests/pending/run/macro-term-declared-in-anonymous.check b/tests/disabled/macro/run/macro-term-declared-in-anonymous.check
index 09b8d015a..09b8d015a 100644
--- a/tests/pending/run/macro-term-declared-in-anonymous.check
+++ b/tests/disabled/macro/run/macro-term-declared-in-anonymous.check
diff --git a/tests/pending/run/macro-term-declared-in-anonymous.flags b/tests/disabled/macro/run/macro-term-declared-in-anonymous.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-term-declared-in-anonymous.flags
+++ b/tests/disabled/macro/run/macro-term-declared-in-anonymous.flags
diff --git a/tests/pending/run/macro-term-declared-in-anonymous/Impls_1.scala b/tests/disabled/macro/run/macro-term-declared-in-anonymous/Impls_1.scala
index c43f5f3f5..c43f5f3f5 100644
--- a/tests/pending/run/macro-term-declared-in-anonymous/Impls_1.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-anonymous/Impls_1.scala
diff --git a/tests/pending/run/macro-term-declared-in-anonymous/Macros_Test_2.scala b/tests/disabled/macro/run/macro-term-declared-in-anonymous/Macros_Test_2.scala
index 894947e1e..894947e1e 100644
--- a/tests/pending/run/macro-term-declared-in-anonymous/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-anonymous/Macros_Test_2.scala
diff --git a/tests/pending/run/macro-term-declared-in-block.check b/tests/disabled/macro/run/macro-term-declared-in-block.check
index 5e687db8b..5e687db8b 100644
--- a/tests/pending/run/macro-term-declared-in-block.check
+++ b/tests/disabled/macro/run/macro-term-declared-in-block.check
diff --git a/tests/pending/run/macro-term-declared-in-block.flags b/tests/disabled/macro/run/macro-term-declared-in-block.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-term-declared-in-block.flags
+++ b/tests/disabled/macro/run/macro-term-declared-in-block.flags
diff --git a/tests/pending/run/macro-term-declared-in-block/Impls_1.scala b/tests/disabled/macro/run/macro-term-declared-in-block/Impls_1.scala
index c43f5f3f5..c43f5f3f5 100644
--- a/tests/pending/run/macro-term-declared-in-block/Impls_1.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-block/Impls_1.scala
diff --git a/tests/pending/run/macro-term-declared-in-block/Macros_Test_2.scala b/tests/disabled/macro/run/macro-term-declared-in-block/Macros_Test_2.scala
index eba5e4961..eba5e4961 100644
--- a/tests/pending/run/macro-term-declared-in-block/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-block/Macros_Test_2.scala
diff --git a/tests/pending/run/macro-term-declared-in-class-class.check b/tests/disabled/macro/run/macro-term-declared-in-class-class.check
index 47248d7af..47248d7af 100644
--- a/tests/pending/run/macro-term-declared-in-class-class.check
+++ b/tests/disabled/macro/run/macro-term-declared-in-class-class.check
diff --git a/tests/pending/run/macro-term-declared-in-class-class.flags b/tests/disabled/macro/run/macro-term-declared-in-class-class.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-term-declared-in-class-class.flags
+++ b/tests/disabled/macro/run/macro-term-declared-in-class-class.flags
diff --git a/tests/pending/run/macro-term-declared-in-class-class/Impls_1.scala b/tests/disabled/macro/run/macro-term-declared-in-class-class/Impls_1.scala
index c43f5f3f5..c43f5f3f5 100644
--- a/tests/pending/run/macro-term-declared-in-class-class/Impls_1.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-class-class/Impls_1.scala
diff --git a/tests/pending/run/macro-term-declared-in-class-class/Macros_Test_2.scala b/tests/disabled/macro/run/macro-term-declared-in-class-class/Macros_Test_2.scala
index 7f813a30d..7f813a30d 100644
--- a/tests/pending/run/macro-term-declared-in-class-class/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-class-class/Macros_Test_2.scala
diff --git a/tests/pending/run/macro-term-declared-in-class-object.check b/tests/disabled/macro/run/macro-term-declared-in-class-object.check
index 35af59e40..35af59e40 100644
--- a/tests/pending/run/macro-term-declared-in-class-object.check
+++ b/tests/disabled/macro/run/macro-term-declared-in-class-object.check
diff --git a/tests/pending/run/macro-term-declared-in-class-object.flags b/tests/disabled/macro/run/macro-term-declared-in-class-object.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-term-declared-in-class-object.flags
+++ b/tests/disabled/macro/run/macro-term-declared-in-class-object.flags
diff --git a/tests/pending/run/macro-term-declared-in-class-object/Impls_1.scala b/tests/disabled/macro/run/macro-term-declared-in-class-object/Impls_1.scala
index c43f5f3f5..c43f5f3f5 100644
--- a/tests/pending/run/macro-term-declared-in-class-object/Impls_1.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-class-object/Impls_1.scala
diff --git a/tests/pending/run/macro-term-declared-in-class-object/Macros_Test_2.scala b/tests/disabled/macro/run/macro-term-declared-in-class-object/Macros_Test_2.scala
index 12c6328c9..12c6328c9 100644
--- a/tests/pending/run/macro-term-declared-in-class-object/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-class-object/Macros_Test_2.scala
diff --git a/tests/pending/run/macro-term-declared-in-class.check b/tests/disabled/macro/run/macro-term-declared-in-class.check
index a1c1d7af8..a1c1d7af8 100644
--- a/tests/pending/run/macro-term-declared-in-class.check
+++ b/tests/disabled/macro/run/macro-term-declared-in-class.check
diff --git a/tests/pending/run/macro-term-declared-in-class.flags b/tests/disabled/macro/run/macro-term-declared-in-class.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-term-declared-in-class.flags
+++ b/tests/disabled/macro/run/macro-term-declared-in-class.flags
diff --git a/tests/pending/run/macro-term-declared-in-class/Impls_1.scala b/tests/disabled/macro/run/macro-term-declared-in-class/Impls_1.scala
index c43f5f3f5..c43f5f3f5 100644
--- a/tests/pending/run/macro-term-declared-in-class/Impls_1.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-class/Impls_1.scala
diff --git a/tests/pending/run/macro-term-declared-in-class/Macros_Test_2.scala b/tests/disabled/macro/run/macro-term-declared-in-class/Macros_Test_2.scala
index 0c9a7ccf0..0c9a7ccf0 100644
--- a/tests/pending/run/macro-term-declared-in-class/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-class/Macros_Test_2.scala
diff --git a/tests/pending/run/macro-term-declared-in-default-param.check b/tests/disabled/macro/run/macro-term-declared-in-default-param.check
index 6decd7aa4..6decd7aa4 100644
--- a/tests/pending/run/macro-term-declared-in-default-param.check
+++ b/tests/disabled/macro/run/macro-term-declared-in-default-param.check
diff --git a/tests/pending/run/macro-term-declared-in-default-param.flags b/tests/disabled/macro/run/macro-term-declared-in-default-param.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-term-declared-in-default-param.flags
+++ b/tests/disabled/macro/run/macro-term-declared-in-default-param.flags
diff --git a/tests/pending/run/macro-term-declared-in-default-param/Impls_1.scala b/tests/disabled/macro/run/macro-term-declared-in-default-param/Impls_1.scala
index ef0f13613..ef0f13613 100644
--- a/tests/pending/run/macro-term-declared-in-default-param/Impls_1.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-default-param/Impls_1.scala
diff --git a/tests/pending/run/macro-term-declared-in-default-param/Macros_Test_2.scala b/tests/disabled/macro/run/macro-term-declared-in-default-param/Macros_Test_2.scala
index 856a4e44f..856a4e44f 100644
--- a/tests/pending/run/macro-term-declared-in-default-param/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-default-param/Macros_Test_2.scala
diff --git a/tests/pending/run/macro-term-declared-in-implicit-class.check b/tests/disabled/macro/run/macro-term-declared-in-implicit-class.check
index 5dc968c08..5dc968c08 100644
--- a/tests/pending/run/macro-term-declared-in-implicit-class.check
+++ b/tests/disabled/macro/run/macro-term-declared-in-implicit-class.check
diff --git a/tests/pending/run/macro-term-declared-in-implicit-class.flags b/tests/disabled/macro/run/macro-term-declared-in-implicit-class.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-term-declared-in-implicit-class.flags
+++ b/tests/disabled/macro/run/macro-term-declared-in-implicit-class.flags
diff --git a/tests/pending/run/macro-term-declared-in-implicit-class/Impls_Macros_1.scala b/tests/disabled/macro/run/macro-term-declared-in-implicit-class/Impls_Macros_1.scala
index ef00f6ff3..ef00f6ff3 100644
--- a/tests/pending/run/macro-term-declared-in-implicit-class/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-implicit-class/Impls_Macros_1.scala
diff --git a/tests/pending/run/macro-term-declared-in-implicit-class/Test_2.scala b/tests/disabled/macro/run/macro-term-declared-in-implicit-class/Test_2.scala
index fd67062be..fd67062be 100644
--- a/tests/pending/run/macro-term-declared-in-implicit-class/Test_2.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-implicit-class/Test_2.scala
diff --git a/tests/pending/run/macro-term-declared-in-method.check b/tests/disabled/macro/run/macro-term-declared-in-method.check
index 5e687db8b..5e687db8b 100644
--- a/tests/pending/run/macro-term-declared-in-method.check
+++ b/tests/disabled/macro/run/macro-term-declared-in-method.check
diff --git a/tests/pending/run/macro-term-declared-in-method.flags b/tests/disabled/macro/run/macro-term-declared-in-method.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-term-declared-in-method.flags
+++ b/tests/disabled/macro/run/macro-term-declared-in-method.flags
diff --git a/tests/pending/run/macro-term-declared-in-method/Impls_1.scala b/tests/disabled/macro/run/macro-term-declared-in-method/Impls_1.scala
index c43f5f3f5..c43f5f3f5 100644
--- a/tests/pending/run/macro-term-declared-in-method/Impls_1.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-method/Impls_1.scala
diff --git a/tests/pending/run/macro-term-declared-in-method/Macros_Test_2.scala b/tests/disabled/macro/run/macro-term-declared-in-method/Macros_Test_2.scala
index d40eb4c60..d40eb4c60 100644
--- a/tests/pending/run/macro-term-declared-in-method/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-method/Macros_Test_2.scala
diff --git a/tests/pending/run/macro-term-declared-in-object-class.check b/tests/disabled/macro/run/macro-term-declared-in-object-class.check
index 47248d7af..47248d7af 100644
--- a/tests/pending/run/macro-term-declared-in-object-class.check
+++ b/tests/disabled/macro/run/macro-term-declared-in-object-class.check
diff --git a/tests/pending/run/macro-term-declared-in-object-class.flags b/tests/disabled/macro/run/macro-term-declared-in-object-class.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-term-declared-in-object-class.flags
+++ b/tests/disabled/macro/run/macro-term-declared-in-object-class.flags
diff --git a/tests/pending/run/macro-term-declared-in-object-class/Impls_1.scala b/tests/disabled/macro/run/macro-term-declared-in-object-class/Impls_1.scala
index c43f5f3f5..c43f5f3f5 100644
--- a/tests/pending/run/macro-term-declared-in-object-class/Impls_1.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-object-class/Impls_1.scala
diff --git a/tests/pending/run/macro-term-declared-in-object-class/Macros_Test_2.scala b/tests/disabled/macro/run/macro-term-declared-in-object-class/Macros_Test_2.scala
index 89aed84c7..89aed84c7 100644
--- a/tests/pending/run/macro-term-declared-in-object-class/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-object-class/Macros_Test_2.scala
diff --git a/tests/pending/run/macro-term-declared-in-object-object.check b/tests/disabled/macro/run/macro-term-declared-in-object-object.check
index 35af59e40..35af59e40 100644
--- a/tests/pending/run/macro-term-declared-in-object-object.check
+++ b/tests/disabled/macro/run/macro-term-declared-in-object-object.check
diff --git a/tests/pending/run/macro-term-declared-in-object-object.flags b/tests/disabled/macro/run/macro-term-declared-in-object-object.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-term-declared-in-object-object.flags
+++ b/tests/disabled/macro/run/macro-term-declared-in-object-object.flags
diff --git a/tests/pending/run/macro-term-declared-in-object-object/Impls_1.scala b/tests/disabled/macro/run/macro-term-declared-in-object-object/Impls_1.scala
index c43f5f3f5..c43f5f3f5 100644
--- a/tests/pending/run/macro-term-declared-in-object-object/Impls_1.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-object-object/Impls_1.scala
diff --git a/tests/pending/run/macro-term-declared-in-object-object/Macros_Test_2.scala b/tests/disabled/macro/run/macro-term-declared-in-object-object/Macros_Test_2.scala
index c5950fe61..c5950fe61 100644
--- a/tests/pending/run/macro-term-declared-in-object-object/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-object-object/Macros_Test_2.scala
diff --git a/tests/pending/run/macro-term-declared-in-object.check b/tests/disabled/macro/run/macro-term-declared-in-object.check
index 4d955a96b..4d955a96b 100644
--- a/tests/pending/run/macro-term-declared-in-object.check
+++ b/tests/disabled/macro/run/macro-term-declared-in-object.check
diff --git a/tests/pending/run/macro-term-declared-in-object.flags b/tests/disabled/macro/run/macro-term-declared-in-object.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-term-declared-in-object.flags
+++ b/tests/disabled/macro/run/macro-term-declared-in-object.flags
diff --git a/tests/pending/run/macro-term-declared-in-object/Impls_1.scala b/tests/disabled/macro/run/macro-term-declared-in-object/Impls_1.scala
index c43f5f3f5..c43f5f3f5 100644
--- a/tests/pending/run/macro-term-declared-in-object/Impls_1.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-object/Impls_1.scala
diff --git a/tests/pending/run/macro-term-declared-in-object/Macros_Test_2.scala b/tests/disabled/macro/run/macro-term-declared-in-object/Macros_Test_2.scala
index f89a21d92..f89a21d92 100644
--- a/tests/pending/run/macro-term-declared-in-object/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-object/Macros_Test_2.scala
diff --git a/tests/pending/run/macro-term-declared-in-package-object.check b/tests/disabled/macro/run/macro-term-declared-in-package-object.check
index bc0069178..bc0069178 100644
--- a/tests/pending/run/macro-term-declared-in-package-object.check
+++ b/tests/disabled/macro/run/macro-term-declared-in-package-object.check
diff --git a/tests/pending/run/macro-term-declared-in-package-object.flags b/tests/disabled/macro/run/macro-term-declared-in-package-object.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-term-declared-in-package-object.flags
+++ b/tests/disabled/macro/run/macro-term-declared-in-package-object.flags
diff --git a/tests/pending/run/macro-term-declared-in-package-object/Impls_1.scala b/tests/disabled/macro/run/macro-term-declared-in-package-object/Impls_1.scala
index c43f5f3f5..c43f5f3f5 100644
--- a/tests/pending/run/macro-term-declared-in-package-object/Impls_1.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-package-object/Impls_1.scala
diff --git a/tests/pending/run/macro-term-declared-in-package-object/Macros_Test_2.scala b/tests/disabled/macro/run/macro-term-declared-in-package-object/Macros_Test_2.scala
index 69f3803ba..69f3803ba 100644
--- a/tests/pending/run/macro-term-declared-in-package-object/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-package-object/Macros_Test_2.scala
diff --git a/tests/pending/run/macro-term-declared-in-refinement.check b/tests/disabled/macro/run/macro-term-declared-in-refinement.check
index 09b8d015a..09b8d015a 100644
--- a/tests/pending/run/macro-term-declared-in-refinement.check
+++ b/tests/disabled/macro/run/macro-term-declared-in-refinement.check
diff --git a/tests/pending/run/macro-term-declared-in-refinement.flags b/tests/disabled/macro/run/macro-term-declared-in-refinement.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-term-declared-in-refinement.flags
+++ b/tests/disabled/macro/run/macro-term-declared-in-refinement.flags
diff --git a/tests/pending/run/macro-term-declared-in-refinement/Impls_1.scala b/tests/disabled/macro/run/macro-term-declared-in-refinement/Impls_1.scala
index c43f5f3f5..c43f5f3f5 100644
--- a/tests/pending/run/macro-term-declared-in-refinement/Impls_1.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-refinement/Impls_1.scala
diff --git a/tests/pending/run/macro-term-declared-in-refinement/Macros_Test_2.scala b/tests/disabled/macro/run/macro-term-declared-in-refinement/Macros_Test_2.scala
index 49192291e..49192291e 100644
--- a/tests/pending/run/macro-term-declared-in-refinement/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-refinement/Macros_Test_2.scala
diff --git a/tests/pending/run/macro-term-declared-in-trait.check b/tests/disabled/macro/run/macro-term-declared-in-trait.check
index 0f3756ddb..0f3756ddb 100644
--- a/tests/pending/run/macro-term-declared-in-trait.check
+++ b/tests/disabled/macro/run/macro-term-declared-in-trait.check
diff --git a/tests/pending/run/macro-term-declared-in-trait.flags b/tests/disabled/macro/run/macro-term-declared-in-trait.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-term-declared-in-trait.flags
+++ b/tests/disabled/macro/run/macro-term-declared-in-trait.flags
diff --git a/tests/pending/run/macro-term-declared-in-trait/Impls_1.scala b/tests/disabled/macro/run/macro-term-declared-in-trait/Impls_1.scala
index c43f5f3f5..c43f5f3f5 100644
--- a/tests/pending/run/macro-term-declared-in-trait/Impls_1.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-trait/Impls_1.scala
diff --git a/tests/pending/run/macro-term-declared-in-trait/Macros_Test_2.scala b/tests/disabled/macro/run/macro-term-declared-in-trait/Macros_Test_2.scala
index 5780aba45..5780aba45 100644
--- a/tests/pending/run/macro-term-declared-in-trait/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-trait/Macros_Test_2.scala
diff --git a/tests/pending/run/macro-typecheck-implicitsdisabled.check b/tests/disabled/macro/run/macro-typecheck-implicitsdisabled.check
index 91d8fabd7..91d8fabd7 100644
--- a/tests/pending/run/macro-typecheck-implicitsdisabled.check
+++ b/tests/disabled/macro/run/macro-typecheck-implicitsdisabled.check
diff --git a/tests/pending/run/macro-typecheck-implicitsdisabled.flags b/tests/disabled/macro/run/macro-typecheck-implicitsdisabled.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-typecheck-implicitsdisabled.flags
+++ b/tests/disabled/macro/run/macro-typecheck-implicitsdisabled.flags
diff --git a/tests/pending/run/macro-typecheck-implicitsdisabled/Impls_Macros_1.scala b/tests/disabled/macro/run/macro-typecheck-implicitsdisabled/Impls_Macros_1.scala
index 956331cfa..956331cfa 100644
--- a/tests/pending/run/macro-typecheck-implicitsdisabled/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/macro-typecheck-implicitsdisabled/Impls_Macros_1.scala
diff --git a/tests/pending/run/macro-typecheck-implicitsdisabled/Test_2.scala b/tests/disabled/macro/run/macro-typecheck-implicitsdisabled/Test_2.scala
index 87d3148e9..87d3148e9 100644
--- a/tests/pending/run/macro-typecheck-implicitsdisabled/Test_2.scala
+++ b/tests/disabled/macro/run/macro-typecheck-implicitsdisabled/Test_2.scala
diff --git a/tests/pending/run/macro-typecheck-macrosdisabled.check b/tests/disabled/macro/run/macro-typecheck-macrosdisabled.check
index c618d22d8..c618d22d8 100644
--- a/tests/pending/run/macro-typecheck-macrosdisabled.check
+++ b/tests/disabled/macro/run/macro-typecheck-macrosdisabled.check
diff --git a/tests/pending/run/macro-typecheck-macrosdisabled.flags b/tests/disabled/macro/run/macro-typecheck-macrosdisabled.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-typecheck-macrosdisabled.flags
+++ b/tests/disabled/macro/run/macro-typecheck-macrosdisabled.flags
diff --git a/tests/pending/run/macro-typecheck-macrosdisabled/Impls_Macros_1.scala b/tests/disabled/macro/run/macro-typecheck-macrosdisabled/Impls_Macros_1.scala
index 0e549f4ab..0e549f4ab 100644
--- a/tests/pending/run/macro-typecheck-macrosdisabled/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/macro-typecheck-macrosdisabled/Impls_Macros_1.scala
diff --git a/tests/pending/run/macro-typecheck-macrosdisabled/Test_2.scala b/tests/disabled/macro/run/macro-typecheck-macrosdisabled/Test_2.scala
index 887f28c8c..887f28c8c 100644
--- a/tests/pending/run/macro-typecheck-macrosdisabled/Test_2.scala
+++ b/tests/disabled/macro/run/macro-typecheck-macrosdisabled/Test_2.scala
diff --git a/tests/pending/run/macro-typecheck-macrosdisabled2.check b/tests/disabled/macro/run/macro-typecheck-macrosdisabled2.check
index 2e862a608..2e862a608 100644
--- a/tests/pending/run/macro-typecheck-macrosdisabled2.check
+++ b/tests/disabled/macro/run/macro-typecheck-macrosdisabled2.check
diff --git a/tests/pending/run/macro-typecheck-macrosdisabled2.flags b/tests/disabled/macro/run/macro-typecheck-macrosdisabled2.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-typecheck-macrosdisabled2.flags
+++ b/tests/disabled/macro/run/macro-typecheck-macrosdisabled2.flags
diff --git a/tests/pending/run/macro-typecheck-macrosdisabled2/Impls_Macros_1.scala b/tests/disabled/macro/run/macro-typecheck-macrosdisabled2/Impls_Macros_1.scala
index f99f5d2f8..f99f5d2f8 100644
--- a/tests/pending/run/macro-typecheck-macrosdisabled2/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/macro-typecheck-macrosdisabled2/Impls_Macros_1.scala
diff --git a/tests/pending/run/macro-typecheck-macrosdisabled2/Test_2.scala b/tests/disabled/macro/run/macro-typecheck-macrosdisabled2/Test_2.scala
index 887f28c8c..887f28c8c 100644
--- a/tests/pending/run/macro-typecheck-macrosdisabled2/Test_2.scala
+++ b/tests/disabled/macro/run/macro-typecheck-macrosdisabled2/Test_2.scala
diff --git a/tests/pending/run/macro-undetparams-consfromsls.check b/tests/disabled/macro/run/macro-undetparams-consfromsls.check
index 3fee58d9c..3fee58d9c 100644
--- a/tests/pending/run/macro-undetparams-consfromsls.check
+++ b/tests/disabled/macro/run/macro-undetparams-consfromsls.check
diff --git a/tests/pending/run/macro-undetparams-consfromsls.flags b/tests/disabled/macro/run/macro-undetparams-consfromsls.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-undetparams-consfromsls.flags
+++ b/tests/disabled/macro/run/macro-undetparams-consfromsls.flags
diff --git a/tests/pending/run/macro-undetparams-consfromsls/Impls_Macros_1.scala b/tests/disabled/macro/run/macro-undetparams-consfromsls/Impls_Macros_1.scala
index 5df5f96aa..5df5f96aa 100644
--- a/tests/pending/run/macro-undetparams-consfromsls/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/macro-undetparams-consfromsls/Impls_Macros_1.scala
diff --git a/tests/pending/run/macro-undetparams-consfromsls/Test_2.scala b/tests/disabled/macro/run/macro-undetparams-consfromsls/Test_2.scala
index 338684401..338684401 100644
--- a/tests/pending/run/macro-undetparams-consfromsls/Test_2.scala
+++ b/tests/disabled/macro/run/macro-undetparams-consfromsls/Test_2.scala
diff --git a/tests/pending/run/macro-undetparams-macroitself.check b/tests/disabled/macro/run/macro-undetparams-macroitself.check
index a9bf55423..a9bf55423 100644
--- a/tests/pending/run/macro-undetparams-macroitself.check
+++ b/tests/disabled/macro/run/macro-undetparams-macroitself.check
diff --git a/tests/pending/run/macro-undetparams-macroitself.flags b/tests/disabled/macro/run/macro-undetparams-macroitself.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/macro-undetparams-macroitself.flags
+++ b/tests/disabled/macro/run/macro-undetparams-macroitself.flags
diff --git a/tests/pending/run/macro-undetparams-macroitself/Impls_Macros_1.scala b/tests/disabled/macro/run/macro-undetparams-macroitself/Impls_Macros_1.scala
index 1eb257e1d..1eb257e1d 100644
--- a/tests/pending/run/macro-undetparams-macroitself/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/macro-undetparams-macroitself/Impls_Macros_1.scala
diff --git a/tests/pending/run/macro-undetparams-macroitself/Test_2.scala b/tests/disabled/macro/run/macro-undetparams-macroitself/Test_2.scala
index c315f3508..c315f3508 100644
--- a/tests/pending/run/macro-undetparams-macroitself/Test_2.scala
+++ b/tests/disabled/macro/run/macro-undetparams-macroitself/Test_2.scala
diff --git a/tests/pending/run/macro-vampire-false-warning.check b/tests/disabled/macro/run/macro-vampire-false-warning.check
index 4792e70f3..4792e70f3 100644
--- a/tests/pending/run/macro-vampire-false-warning.check
+++ b/tests/disabled/macro/run/macro-vampire-false-warning.check
diff --git a/tests/pending/run/macro-vampire-false-warning.flags b/tests/disabled/macro/run/macro-vampire-false-warning.flags
index e8fb65d50..e8fb65d50 100644
--- a/tests/pending/run/macro-vampire-false-warning.flags
+++ b/tests/disabled/macro/run/macro-vampire-false-warning.flags
diff --git a/tests/pending/run/macro-vampire-false-warning/Macros_1.scala b/tests/disabled/macro/run/macro-vampire-false-warning/Macros_1.scala
index 63c34b3ab..63c34b3ab 100644
--- a/tests/pending/run/macro-vampire-false-warning/Macros_1.scala
+++ b/tests/disabled/macro/run/macro-vampire-false-warning/Macros_1.scala
diff --git a/tests/pending/run/macro-vampire-false-warning/Test_2.scala b/tests/disabled/macro/run/macro-vampire-false-warning/Test_2.scala
index d28849b88..d28849b88 100644
--- a/tests/pending/run/macro-vampire-false-warning/Test_2.scala
+++ b/tests/disabled/macro/run/macro-vampire-false-warning/Test_2.scala
diff --git a/tests/pending/run/macro-whitebox-dynamic-materialization.check b/tests/disabled/macro/run/macro-whitebox-dynamic-materialization.check
index ccec8e5b2..ccec8e5b2 100644
--- a/tests/pending/run/macro-whitebox-dynamic-materialization.check
+++ b/tests/disabled/macro/run/macro-whitebox-dynamic-materialization.check
diff --git a/tests/pending/run/macro-whitebox-dynamic-materialization/Macros_1.scala b/tests/disabled/macro/run/macro-whitebox-dynamic-materialization/Macros_1.scala
index aaf27c289..aaf27c289 100644
--- a/tests/pending/run/macro-whitebox-dynamic-materialization/Macros_1.scala
+++ b/tests/disabled/macro/run/macro-whitebox-dynamic-materialization/Macros_1.scala
diff --git a/tests/pending/run/macro-whitebox-dynamic-materialization/Test_2.scala b/tests/disabled/macro/run/macro-whitebox-dynamic-materialization/Test_2.scala
index 10d89dd3c..10d89dd3c 100644
--- a/tests/pending/run/macro-whitebox-dynamic-materialization/Test_2.scala
+++ b/tests/disabled/macro/run/macro-whitebox-dynamic-materialization/Test_2.scala
diff --git a/tests/pending/run/macro-whitebox-extractor.check b/tests/disabled/macro/run/macro-whitebox-extractor.check
index d81cc0710..d81cc0710 100644
--- a/tests/pending/run/macro-whitebox-extractor.check
+++ b/tests/disabled/macro/run/macro-whitebox-extractor.check
diff --git a/tests/pending/run/macro-whitebox-extractor/Macros_1.scala b/tests/disabled/macro/run/macro-whitebox-extractor/Macros_1.scala
index d394c0241..d394c0241 100644
--- a/tests/pending/run/macro-whitebox-extractor/Macros_1.scala
+++ b/tests/disabled/macro/run/macro-whitebox-extractor/Macros_1.scala
diff --git a/tests/pending/run/macro-whitebox-extractor/Test_2.scala b/tests/disabled/macro/run/macro-whitebox-extractor/Test_2.scala
index 7c354ecd6..7c354ecd6 100644
--- a/tests/pending/run/macro-whitebox-extractor/Test_2.scala
+++ b/tests/disabled/macro/run/macro-whitebox-extractor/Test_2.scala
diff --git a/tests/pending/run/macro-whitebox-fundep-materialization.check b/tests/disabled/macro/run/macro-whitebox-fundep-materialization.check
index bed742910..bed742910 100644
--- a/tests/pending/run/macro-whitebox-fundep-materialization.check
+++ b/tests/disabled/macro/run/macro-whitebox-fundep-materialization.check
diff --git a/tests/pending/run/macro-whitebox-fundep-materialization/Macros_1.scala b/tests/disabled/macro/run/macro-whitebox-fundep-materialization/Macros_1.scala
index 5e89e6b2f..5e89e6b2f 100644
--- a/tests/pending/run/macro-whitebox-fundep-materialization/Macros_1.scala
+++ b/tests/disabled/macro/run/macro-whitebox-fundep-materialization/Macros_1.scala
diff --git a/tests/pending/run/macro-whitebox-fundep-materialization/Test_2.scala b/tests/disabled/macro/run/macro-whitebox-fundep-materialization/Test_2.scala
index 72183ba86..72183ba86 100644
--- a/tests/pending/run/macro-whitebox-fundep-materialization/Test_2.scala
+++ b/tests/disabled/macro/run/macro-whitebox-fundep-materialization/Test_2.scala
diff --git a/tests/pending/run/macro-whitebox-structural.check b/tests/disabled/macro/run/macro-whitebox-structural.check
index 0cfbf0888..0cfbf0888 100644
--- a/tests/pending/run/macro-whitebox-structural.check
+++ b/tests/disabled/macro/run/macro-whitebox-structural.check
diff --git a/tests/pending/run/macro-whitebox-structural/Impls_Macros_1.scala b/tests/disabled/macro/run/macro-whitebox-structural/Impls_Macros_1.scala
index 45fdb79c3..45fdb79c3 100644
--- a/tests/pending/run/macro-whitebox-structural/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/macro-whitebox-structural/Impls_Macros_1.scala
diff --git a/tests/pending/run/macro-whitebox-structural/Test_2.scala b/tests/disabled/macro/run/macro-whitebox-structural/Test_2.scala
index 6fa47e1dd..6fa47e1dd 100644
--- a/tests/pending/run/macro-whitebox-structural/Test_2.scala
+++ b/tests/disabled/macro/run/macro-whitebox-structural/Test_2.scala
diff --git a/tests/pending/run/macroPlugins-isBlackbox/Macros_2.scala b/tests/disabled/macro/run/macroPlugins-isBlackbox/Macros_2.scala
index a90dd702d..a90dd702d 100644
--- a/tests/pending/run/macroPlugins-isBlackbox/Macros_2.scala
+++ b/tests/disabled/macro/run/macroPlugins-isBlackbox/Macros_2.scala
diff --git a/tests/pending/run/macroPlugins-isBlackbox/Plugin_1.scala b/tests/disabled/macro/run/macroPlugins-isBlackbox/Plugin_1.scala
index b78a18ea6..b78a18ea6 100644
--- a/tests/pending/run/macroPlugins-isBlackbox/Plugin_1.scala
+++ b/tests/disabled/macro/run/macroPlugins-isBlackbox/Plugin_1.scala
diff --git a/tests/pending/run/macroPlugins-isBlackbox/Test_3.flags b/tests/disabled/macro/run/macroPlugins-isBlackbox/Test_3.flags
index 966df731d..966df731d 100644
--- a/tests/pending/run/macroPlugins-isBlackbox/Test_3.flags
+++ b/tests/disabled/macro/run/macroPlugins-isBlackbox/Test_3.flags
diff --git a/tests/pending/run/macroPlugins-isBlackbox/Test_3.scala b/tests/disabled/macro/run/macroPlugins-isBlackbox/Test_3.scala
index f191e5de3..f191e5de3 100644
--- a/tests/pending/run/macroPlugins-isBlackbox/Test_3.scala
+++ b/tests/disabled/macro/run/macroPlugins-isBlackbox/Test_3.scala
diff --git a/tests/pending/run/macroPlugins-isBlackbox/scalac-plugin.xml b/tests/disabled/macro/run/macroPlugins-isBlackbox/scalac-plugin.xml
index 09b9c1464..09b9c1464 100644
--- a/tests/pending/run/macroPlugins-isBlackbox/scalac-plugin.xml
+++ b/tests/disabled/macro/run/macroPlugins-isBlackbox/scalac-plugin.xml
diff --git a/tests/pending/run/macroPlugins-macroArgs.check b/tests/disabled/macro/run/macroPlugins-macroArgs.check
index a68f8069b..a68f8069b 100644
--- a/tests/pending/run/macroPlugins-macroArgs.check
+++ b/tests/disabled/macro/run/macroPlugins-macroArgs.check
diff --git a/tests/pending/run/macroPlugins-macroArgs/Macros_2.scala b/tests/disabled/macro/run/macroPlugins-macroArgs/Macros_2.scala
index b19b8f18d..b19b8f18d 100644
--- a/tests/pending/run/macroPlugins-macroArgs/Macros_2.scala
+++ b/tests/disabled/macro/run/macroPlugins-macroArgs/Macros_2.scala
diff --git a/tests/pending/run/macroPlugins-macroArgs/Plugin_1.scala b/tests/disabled/macro/run/macroPlugins-macroArgs/Plugin_1.scala
index 23e80ced3..23e80ced3 100644
--- a/tests/pending/run/macroPlugins-macroArgs/Plugin_1.scala
+++ b/tests/disabled/macro/run/macroPlugins-macroArgs/Plugin_1.scala
diff --git a/tests/pending/run/macroPlugins-macroArgs/Test_3.flags b/tests/disabled/macro/run/macroPlugins-macroArgs/Test_3.flags
index 966df731d..966df731d 100644
--- a/tests/pending/run/macroPlugins-macroArgs/Test_3.flags
+++ b/tests/disabled/macro/run/macroPlugins-macroArgs/Test_3.flags
diff --git a/tests/pending/run/macroPlugins-macroArgs/Test_3.scala b/tests/disabled/macro/run/macroPlugins-macroArgs/Test_3.scala
index 8d3be78bb..8d3be78bb 100644
--- a/tests/pending/run/macroPlugins-macroArgs/Test_3.scala
+++ b/tests/disabled/macro/run/macroPlugins-macroArgs/Test_3.scala
diff --git a/tests/pending/run/macroPlugins-macroArgs/scalac-plugin.xml b/tests/disabled/macro/run/macroPlugins-macroArgs/scalac-plugin.xml
index 0849f0f4e..0849f0f4e 100644
--- a/tests/pending/run/macroPlugins-macroArgs/scalac-plugin.xml
+++ b/tests/disabled/macro/run/macroPlugins-macroArgs/scalac-plugin.xml
diff --git a/tests/pending/run/macroPlugins-macroExpand.check b/tests/disabled/macro/run/macroPlugins-macroExpand.check
index 6f685c2af..6f685c2af 100644
--- a/tests/pending/run/macroPlugins-macroExpand.check
+++ b/tests/disabled/macro/run/macroPlugins-macroExpand.check
diff --git a/tests/pending/run/macroPlugins-macroExpand.flags b/tests/disabled/macro/run/macroPlugins-macroExpand.flags
index ea7fc37e1..ea7fc37e1 100644
--- a/tests/pending/run/macroPlugins-macroExpand.flags
+++ b/tests/disabled/macro/run/macroPlugins-macroExpand.flags
diff --git a/tests/pending/run/macroPlugins-macroExpand/Macros_2.scala b/tests/disabled/macro/run/macroPlugins-macroExpand/Macros_2.scala
index c9c88ad2f..c9c88ad2f 100644
--- a/tests/pending/run/macroPlugins-macroExpand/Macros_2.scala
+++ b/tests/disabled/macro/run/macroPlugins-macroExpand/Macros_2.scala
diff --git a/tests/pending/run/macroPlugins-macroExpand/Plugin_1.scala b/tests/disabled/macro/run/macroPlugins-macroExpand/Plugin_1.scala
index 13df85cb2..13df85cb2 100644
--- a/tests/pending/run/macroPlugins-macroExpand/Plugin_1.scala
+++ b/tests/disabled/macro/run/macroPlugins-macroExpand/Plugin_1.scala
diff --git a/tests/pending/run/macroPlugins-macroExpand/Test_3.flags b/tests/disabled/macro/run/macroPlugins-macroExpand/Test_3.flags
index 966df731d..966df731d 100644
--- a/tests/pending/run/macroPlugins-macroExpand/Test_3.flags
+++ b/tests/disabled/macro/run/macroPlugins-macroExpand/Test_3.flags
diff --git a/tests/pending/run/macroPlugins-macroExpand/Test_3.scala b/tests/disabled/macro/run/macroPlugins-macroExpand/Test_3.scala
index a730821f2..a730821f2 100644
--- a/tests/pending/run/macroPlugins-macroExpand/Test_3.scala
+++ b/tests/disabled/macro/run/macroPlugins-macroExpand/Test_3.scala
diff --git a/tests/pending/run/macroPlugins-macroExpand/scalac-plugin.xml b/tests/disabled/macro/run/macroPlugins-macroExpand/scalac-plugin.xml
index 860150865..860150865 100644
--- a/tests/pending/run/macroPlugins-macroExpand/scalac-plugin.xml
+++ b/tests/disabled/macro/run/macroPlugins-macroExpand/scalac-plugin.xml
diff --git a/tests/pending/run/macroPlugins-macroRuntime.check b/tests/disabled/macro/run/macroPlugins-macroRuntime.check
index af16d1ac3..af16d1ac3 100644
--- a/tests/pending/run/macroPlugins-macroRuntime.check
+++ b/tests/disabled/macro/run/macroPlugins-macroRuntime.check
diff --git a/tests/pending/run/macroPlugins-macroRuntime/Macros_2.scala b/tests/disabled/macro/run/macroPlugins-macroRuntime/Macros_2.scala
index b19b8f18d..b19b8f18d 100644
--- a/tests/pending/run/macroPlugins-macroRuntime/Macros_2.scala
+++ b/tests/disabled/macro/run/macroPlugins-macroRuntime/Macros_2.scala
diff --git a/tests/pending/run/macroPlugins-macroRuntime/Plugin_1.scala b/tests/disabled/macro/run/macroPlugins-macroRuntime/Plugin_1.scala
index a55adadb4..a55adadb4 100644
--- a/tests/pending/run/macroPlugins-macroRuntime/Plugin_1.scala
+++ b/tests/disabled/macro/run/macroPlugins-macroRuntime/Plugin_1.scala
diff --git a/tests/pending/run/macroPlugins-macroRuntime/Test_3.flags b/tests/disabled/macro/run/macroPlugins-macroRuntime/Test_3.flags
index 966df731d..966df731d 100644
--- a/tests/pending/run/macroPlugins-macroRuntime/Test_3.flags
+++ b/tests/disabled/macro/run/macroPlugins-macroRuntime/Test_3.flags
diff --git a/tests/pending/run/macroPlugins-macroRuntime/Test_3.scala b/tests/disabled/macro/run/macroPlugins-macroRuntime/Test_3.scala
index 8d3be78bb..8d3be78bb 100644
--- a/tests/pending/run/macroPlugins-macroRuntime/Test_3.scala
+++ b/tests/disabled/macro/run/macroPlugins-macroRuntime/Test_3.scala
diff --git a/tests/pending/run/macroPlugins-macroRuntime/scalac-plugin.xml b/tests/disabled/macro/run/macroPlugins-macroRuntime/scalac-plugin.xml
index 8001af105..8001af105 100644
--- a/tests/pending/run/macroPlugins-macroRuntime/scalac-plugin.xml
+++ b/tests/disabled/macro/run/macroPlugins-macroRuntime/scalac-plugin.xml
diff --git a/tests/pending/run/macroPlugins-namerHooks.check b/tests/disabled/macro/run/macroPlugins-namerHooks.check
index c2db5935d..c2db5935d 100644
--- a/tests/pending/run/macroPlugins-namerHooks.check
+++ b/tests/disabled/macro/run/macroPlugins-namerHooks.check
diff --git a/tests/pending/run/macroPlugins-namerHooks.scala b/tests/disabled/macro/run/macroPlugins-namerHooks.scala
index 302429b19..302429b19 100644
--- a/tests/pending/run/macroPlugins-namerHooks.scala
+++ b/tests/disabled/macro/run/macroPlugins-namerHooks.scala
diff --git a/tests/pending/run/macroPlugins-typedMacroBody.check b/tests/disabled/macro/run/macroPlugins-typedMacroBody.check
index b6f843618..b6f843618 100644
--- a/tests/pending/run/macroPlugins-typedMacroBody.check
+++ b/tests/disabled/macro/run/macroPlugins-typedMacroBody.check
diff --git a/tests/pending/run/macroPlugins-typedMacroBody.flags b/tests/disabled/macro/run/macroPlugins-typedMacroBody.flags
index ea7fc37e1..ea7fc37e1 100644
--- a/tests/pending/run/macroPlugins-typedMacroBody.flags
+++ b/tests/disabled/macro/run/macroPlugins-typedMacroBody.flags
diff --git a/tests/pending/run/macroPlugins-typedMacroBody/Macros_2.flags b/tests/disabled/macro/run/macroPlugins-typedMacroBody/Macros_2.flags
index 966df731d..966df731d 100644
--- a/tests/pending/run/macroPlugins-typedMacroBody/Macros_2.flags
+++ b/tests/disabled/macro/run/macroPlugins-typedMacroBody/Macros_2.flags
diff --git a/tests/pending/run/macroPlugins-typedMacroBody/Macros_2.scala b/tests/disabled/macro/run/macroPlugins-typedMacroBody/Macros_2.scala
index 80acfec65..80acfec65 100644
--- a/tests/pending/run/macroPlugins-typedMacroBody/Macros_2.scala
+++ b/tests/disabled/macro/run/macroPlugins-typedMacroBody/Macros_2.scala
diff --git a/tests/pending/run/macroPlugins-typedMacroBody/Plugin_1.scala b/tests/disabled/macro/run/macroPlugins-typedMacroBody/Plugin_1.scala
index e99cf7f75..e99cf7f75 100644
--- a/tests/pending/run/macroPlugins-typedMacroBody/Plugin_1.scala
+++ b/tests/disabled/macro/run/macroPlugins-typedMacroBody/Plugin_1.scala
diff --git a/tests/pending/run/macroPlugins-typedMacroBody/Test_3.scala b/tests/disabled/macro/run/macroPlugins-typedMacroBody/Test_3.scala
index a730821f2..a730821f2 100644
--- a/tests/pending/run/macroPlugins-typedMacroBody/Test_3.scala
+++ b/tests/disabled/macro/run/macroPlugins-typedMacroBody/Test_3.scala
diff --git a/tests/pending/run/macroPlugins-typedMacroBody/scalac-plugin.xml b/tests/disabled/macro/run/macroPlugins-typedMacroBody/scalac-plugin.xml
index e223fa5dc..e223fa5dc 100644
--- a/tests/pending/run/macroPlugins-typedMacroBody/scalac-plugin.xml
+++ b/tests/disabled/macro/run/macroPlugins-typedMacroBody/scalac-plugin.xml
diff --git a/tests/pending/run/reflection-magicsymbols-invoke.check b/tests/disabled/macro/run/reflection-magicsymbols-invoke.check
index f580296ae..f580296ae 100644
--- a/tests/pending/run/reflection-magicsymbols-invoke.check
+++ b/tests/disabled/macro/run/reflection-magicsymbols-invoke.check
diff --git a/tests/pending/run/reflection-magicsymbols-invoke.scala b/tests/disabled/macro/run/reflection-magicsymbols-invoke.scala
index bbcf8f524..bbcf8f524 100644
--- a/tests/pending/run/reflection-magicsymbols-invoke.scala
+++ b/tests/disabled/macro/run/reflection-magicsymbols-invoke.scala
diff --git a/tests/pending/run/reify-each-node-type.check b/tests/disabled/macro/run/reify-each-node-type.check
index afc65add7..afc65add7 100644
--- a/tests/pending/run/reify-each-node-type.check
+++ b/tests/disabled/macro/run/reify-each-node-type.check
diff --git a/tests/pending/run/reify-each-node-type.scala b/tests/disabled/macro/run/reify-each-node-type.scala
index 43d32e59d..43d32e59d 100644
--- a/tests/pending/run/reify-each-node-type.scala
+++ b/tests/disabled/macro/run/reify-each-node-type.scala
diff --git a/tests/pending/run/reify-repl-fail-gracefully.check b/tests/disabled/macro/run/reify-repl-fail-gracefully.check
index c9e69744d..c9e69744d 100644
--- a/tests/pending/run/reify-repl-fail-gracefully.check
+++ b/tests/disabled/macro/run/reify-repl-fail-gracefully.check
diff --git a/tests/pending/run/reify-repl-fail-gracefully.scala b/tests/disabled/macro/run/reify-repl-fail-gracefully.scala
index ed6d6cb6c..ed6d6cb6c 100644
--- a/tests/pending/run/reify-repl-fail-gracefully.scala
+++ b/tests/disabled/macro/run/reify-repl-fail-gracefully.scala
diff --git a/tests/pending/run/reify-staticXXX.check b/tests/disabled/macro/run/reify-staticXXX.check
index 37102b29e..37102b29e 100644
--- a/tests/pending/run/reify-staticXXX.check
+++ b/tests/disabled/macro/run/reify-staticXXX.check
diff --git a/tests/pending/run/reify-staticXXX.scala b/tests/disabled/macro/run/reify-staticXXX.scala
index cfbd756ec..cfbd756ec 100644
--- a/tests/pending/run/reify-staticXXX.scala
+++ b/tests/disabled/macro/run/reify-staticXXX.scala
diff --git a/tests/pending/run/reify_ann1a.check b/tests/disabled/macro/run/reify_ann1a.check
index 71841ff83..71841ff83 100644
--- a/tests/pending/run/reify_ann1a.check
+++ b/tests/disabled/macro/run/reify_ann1a.check
diff --git a/tests/pending/run/reify_ann1a.scala b/tests/disabled/macro/run/reify_ann1a.scala
index 9252ddcf7..9252ddcf7 100644
--- a/tests/pending/run/reify_ann1a.scala
+++ b/tests/disabled/macro/run/reify_ann1a.scala
diff --git a/tests/pending/run/reify_ann1b.check b/tests/disabled/macro/run/reify_ann1b.check
index a046dafea..a046dafea 100644
--- a/tests/pending/run/reify_ann1b.check
+++ b/tests/disabled/macro/run/reify_ann1b.check
diff --git a/tests/pending/run/reify_ann1b.scala b/tests/disabled/macro/run/reify_ann1b.scala
index d3c6a4da3..d3c6a4da3 100644
--- a/tests/pending/run/reify_ann1b.scala
+++ b/tests/disabled/macro/run/reify_ann1b.scala
diff --git a/tests/pending/run/reify_ann2a.check b/tests/disabled/macro/run/reify_ann2a.check
index a26fa4204..a26fa4204 100644
--- a/tests/pending/run/reify_ann2a.check
+++ b/tests/disabled/macro/run/reify_ann2a.check
diff --git a/tests/pending/run/reify_ann2a.scala b/tests/disabled/macro/run/reify_ann2a.scala
index 861cb6297..861cb6297 100644
--- a/tests/pending/run/reify_ann2a.scala
+++ b/tests/disabled/macro/run/reify_ann2a.scala
diff --git a/tests/pending/run/reify_ann3.check b/tests/disabled/macro/run/reify_ann3.check
index 4f1c61cf0..4f1c61cf0 100644
--- a/tests/pending/run/reify_ann3.check
+++ b/tests/disabled/macro/run/reify_ann3.check
diff --git a/tests/pending/run/reify_ann3.scala b/tests/disabled/macro/run/reify_ann3.scala
index 7eadd569b..7eadd569b 100644
--- a/tests/pending/run/reify_ann3.scala
+++ b/tests/disabled/macro/run/reify_ann3.scala
diff --git a/tests/pending/run/reify_ann4.check b/tests/disabled/macro/run/reify_ann4.check
index 8bf5fe324..8bf5fe324 100644
--- a/tests/pending/run/reify_ann4.check
+++ b/tests/disabled/macro/run/reify_ann4.check
diff --git a/tests/pending/run/reify_ann4.scala b/tests/disabled/macro/run/reify_ann4.scala
index 074ceb815..074ceb815 100644
--- a/tests/pending/run/reify_ann4.scala
+++ b/tests/disabled/macro/run/reify_ann4.scala
diff --git a/tests/pending/run/reify_ann5.check b/tests/disabled/macro/run/reify_ann5.check
index 1ec0457e5..1ec0457e5 100644
--- a/tests/pending/run/reify_ann5.check
+++ b/tests/disabled/macro/run/reify_ann5.check
diff --git a/tests/pending/run/reify_ann5.scala b/tests/disabled/macro/run/reify_ann5.scala
index 84e5bda9c..84e5bda9c 100644
--- a/tests/pending/run/reify_ann5.scala
+++ b/tests/disabled/macro/run/reify_ann5.scala
diff --git a/tests/pending/run/reify_anonymous.check b/tests/disabled/macro/run/reify_anonymous.check
index b8626c4cf..b8626c4cf 100644
--- a/tests/pending/run/reify_anonymous.check
+++ b/tests/disabled/macro/run/reify_anonymous.check
diff --git a/tests/pending/run/reify_anonymous.scala b/tests/disabled/macro/run/reify_anonymous.scala
index a7aad4065..a7aad4065 100644
--- a/tests/pending/run/reify_anonymous.scala
+++ b/tests/disabled/macro/run/reify_anonymous.scala
diff --git a/tests/pending/run/reify_classfileann_a.check b/tests/disabled/macro/run/reify_classfileann_a.check
index 51f255b23..51f255b23 100644
--- a/tests/pending/run/reify_classfileann_a.check
+++ b/tests/disabled/macro/run/reify_classfileann_a.check
diff --git a/tests/pending/run/reify_classfileann_a.scala b/tests/disabled/macro/run/reify_classfileann_a.scala
index 74546df37..74546df37 100644
--- a/tests/pending/run/reify_classfileann_a.scala
+++ b/tests/disabled/macro/run/reify_classfileann_a.scala
diff --git a/tests/pending/run/reify_classfileann_b.check b/tests/disabled/macro/run/reify_classfileann_b.check
index 05f2e5bfc..05f2e5bfc 100644
--- a/tests/pending/run/reify_classfileann_b.check
+++ b/tests/disabled/macro/run/reify_classfileann_b.check
diff --git a/tests/pending/run/reify_classfileann_b.scala b/tests/disabled/macro/run/reify_classfileann_b.scala
index 920d671f9..920d671f9 100644
--- a/tests/pending/run/reify_classfileann_b.scala
+++ b/tests/disabled/macro/run/reify_classfileann_b.scala
diff --git a/tests/pending/run/reify_closure1.check b/tests/disabled/macro/run/reify_closure1.check
index b2f7f08c1..b2f7f08c1 100644
--- a/tests/pending/run/reify_closure1.check
+++ b/tests/disabled/macro/run/reify_closure1.check
diff --git a/tests/pending/run/reify_closure1.scala b/tests/disabled/macro/run/reify_closure1.scala
index 6a5684b2a..6a5684b2a 100644
--- a/tests/pending/run/reify_closure1.scala
+++ b/tests/disabled/macro/run/reify_closure1.scala
diff --git a/tests/pending/run/reify_closure2a.check b/tests/disabled/macro/run/reify_closure2a.check
index c1f3abd7e..c1f3abd7e 100644
--- a/tests/pending/run/reify_closure2a.check
+++ b/tests/disabled/macro/run/reify_closure2a.check
diff --git a/tests/pending/run/reify_closure2a.scala b/tests/disabled/macro/run/reify_closure2a.scala
index cc194bc6d..cc194bc6d 100644
--- a/tests/pending/run/reify_closure2a.scala
+++ b/tests/disabled/macro/run/reify_closure2a.scala
diff --git a/tests/pending/run/reify_closure3a.check b/tests/disabled/macro/run/reify_closure3a.check
index c1f3abd7e..c1f3abd7e 100644
--- a/tests/pending/run/reify_closure3a.check
+++ b/tests/disabled/macro/run/reify_closure3a.check
diff --git a/tests/pending/run/reify_closure3a.scala b/tests/disabled/macro/run/reify_closure3a.scala
index 0d540d1dd..0d540d1dd 100644
--- a/tests/pending/run/reify_closure3a.scala
+++ b/tests/disabled/macro/run/reify_closure3a.scala
diff --git a/tests/pending/run/reify_closure4a.check b/tests/disabled/macro/run/reify_closure4a.check
index c1f3abd7e..c1f3abd7e 100644
--- a/tests/pending/run/reify_closure4a.check
+++ b/tests/disabled/macro/run/reify_closure4a.check
diff --git a/tests/pending/run/reify_closure4a.scala b/tests/disabled/macro/run/reify_closure4a.scala
index 373c3b2fa..373c3b2fa 100644
--- a/tests/pending/run/reify_closure4a.scala
+++ b/tests/disabled/macro/run/reify_closure4a.scala
diff --git a/tests/pending/run/reify_closure5a.check b/tests/disabled/macro/run/reify_closure5a.check
index df9e19c59..df9e19c59 100644
--- a/tests/pending/run/reify_closure5a.check
+++ b/tests/disabled/macro/run/reify_closure5a.check
diff --git a/tests/pending/run/reify_closure5a.scala b/tests/disabled/macro/run/reify_closure5a.scala
index e2bd24ad2..e2bd24ad2 100644
--- a/tests/pending/run/reify_closure5a.scala
+++ b/tests/disabled/macro/run/reify_closure5a.scala
diff --git a/tests/pending/run/reify_closure6.check b/tests/disabled/macro/run/reify_closure6.check
index b9de4c6ba..b9de4c6ba 100644
--- a/tests/pending/run/reify_closure6.check
+++ b/tests/disabled/macro/run/reify_closure6.check
diff --git a/tests/pending/run/reify_closure6.scala b/tests/disabled/macro/run/reify_closure6.scala
index 1c3589cdf..1c3589cdf 100644
--- a/tests/pending/run/reify_closure6.scala
+++ b/tests/disabled/macro/run/reify_closure6.scala
diff --git a/tests/pending/run/reify_closure7.check b/tests/disabled/macro/run/reify_closure7.check
index bf58b52bc..bf58b52bc 100644
--- a/tests/pending/run/reify_closure7.check
+++ b/tests/disabled/macro/run/reify_closure7.check
diff --git a/tests/pending/run/reify_closure7.scala b/tests/disabled/macro/run/reify_closure7.scala
index 93f2f22a4..93f2f22a4 100644
--- a/tests/pending/run/reify_closure7.scala
+++ b/tests/disabled/macro/run/reify_closure7.scala
diff --git a/tests/pending/run/reify_closure8a.check b/tests/disabled/macro/run/reify_closure8a.check
index 9a037142a..9a037142a 100644
--- a/tests/pending/run/reify_closure8a.check
+++ b/tests/disabled/macro/run/reify_closure8a.check
diff --git a/tests/pending/run/reify_closure8a.scala b/tests/disabled/macro/run/reify_closure8a.scala
index ad343dd15..ad343dd15 100644
--- a/tests/pending/run/reify_closure8a.scala
+++ b/tests/disabled/macro/run/reify_closure8a.scala
diff --git a/tests/pending/run/reify_closure8b.check b/tests/disabled/macro/run/reify_closure8b.check
index 5d48d3ab3..5d48d3ab3 100644
--- a/tests/pending/run/reify_closure8b.check
+++ b/tests/disabled/macro/run/reify_closure8b.check
diff --git a/tests/pending/run/reify_closure8b.scala b/tests/disabled/macro/run/reify_closure8b.scala
index f28b18e01..f28b18e01 100644
--- a/tests/pending/run/reify_closure8b.scala
+++ b/tests/disabled/macro/run/reify_closure8b.scala
diff --git a/tests/pending/run/reify_closures10.check b/tests/disabled/macro/run/reify_closures10.check
index fd3c81a4d..fd3c81a4d 100644
--- a/tests/pending/run/reify_closures10.check
+++ b/tests/disabled/macro/run/reify_closures10.check
diff --git a/tests/pending/run/reify_closures10.scala b/tests/disabled/macro/run/reify_closures10.scala
index 9c486e436..9c486e436 100644
--- a/tests/pending/run/reify_closures10.scala
+++ b/tests/disabled/macro/run/reify_closures10.scala
diff --git a/tests/pending/run/reify_complex.check b/tests/disabled/macro/run/reify_complex.check
index 7df35e33a..7df35e33a 100644
--- a/tests/pending/run/reify_complex.check
+++ b/tests/disabled/macro/run/reify_complex.check
diff --git a/tests/pending/run/reify_complex.scala b/tests/disabled/macro/run/reify_complex.scala
index 45b72d899..45b72d899 100644
--- a/tests/pending/run/reify_complex.scala
+++ b/tests/disabled/macro/run/reify_complex.scala
diff --git a/tests/pending/run/reify_copypaste1.check b/tests/disabled/macro/run/reify_copypaste1.check
index b204f9c45..b204f9c45 100644
--- a/tests/pending/run/reify_copypaste1.check
+++ b/tests/disabled/macro/run/reify_copypaste1.check
diff --git a/tests/pending/run/reify_copypaste1.scala b/tests/disabled/macro/run/reify_copypaste1.scala
index e255403ad..e255403ad 100644
--- a/tests/pending/run/reify_copypaste1.scala
+++ b/tests/disabled/macro/run/reify_copypaste1.scala
diff --git a/tests/pending/run/reify_copypaste2.check b/tests/disabled/macro/run/reify_copypaste2.check
index f5c107696..f5c107696 100644
--- a/tests/pending/run/reify_copypaste2.check
+++ b/tests/disabled/macro/run/reify_copypaste2.check
diff --git a/tests/pending/run/reify_copypaste2.scala b/tests/disabled/macro/run/reify_copypaste2.scala
index 2f9bea1fe..2f9bea1fe 100644
--- a/tests/pending/run/reify_copypaste2.scala
+++ b/tests/disabled/macro/run/reify_copypaste2.scala
diff --git a/tests/pending/run/reify_csv.check b/tests/disabled/macro/run/reify_csv.check
index b56f4bb50..b56f4bb50 100644
--- a/tests/pending/run/reify_csv.check
+++ b/tests/disabled/macro/run/reify_csv.check
diff --git a/tests/pending/run/reify_csv.scala b/tests/disabled/macro/run/reify_csv.scala
index 1c567c904..1c567c904 100644
--- a/tests/pending/run/reify_csv.scala
+++ b/tests/disabled/macro/run/reify_csv.scala
diff --git a/tests/pending/run/reify_extendbuiltins.check b/tests/disabled/macro/run/reify_extendbuiltins.check
index a48033a30..a48033a30 100644
--- a/tests/pending/run/reify_extendbuiltins.check
+++ b/tests/disabled/macro/run/reify_extendbuiltins.check
diff --git a/tests/pending/run/reify_extendbuiltins.scala b/tests/disabled/macro/run/reify_extendbuiltins.scala
index 3056db6e4..3056db6e4 100644
--- a/tests/pending/run/reify_extendbuiltins.scala
+++ b/tests/disabled/macro/run/reify_extendbuiltins.scala
diff --git a/tests/pending/run/reify_for1.scala b/tests/disabled/macro/run/reify_for1.scala
index 1233782ad..1233782ad 100644
--- a/tests/pending/run/reify_for1.scala
+++ b/tests/disabled/macro/run/reify_for1.scala
diff --git a/tests/pending/run/reify_fors_newpatmat.check b/tests/disabled/macro/run/reify_fors_newpatmat.check
index eefddedc2..eefddedc2 100644
--- a/tests/pending/run/reify_fors_newpatmat.check
+++ b/tests/disabled/macro/run/reify_fors_newpatmat.check
diff --git a/tests/pending/run/reify_fors_newpatmat.scala b/tests/disabled/macro/run/reify_fors_newpatmat.scala
index d366169a4..d366169a4 100644
--- a/tests/pending/run/reify_fors_newpatmat.scala
+++ b/tests/disabled/macro/run/reify_fors_newpatmat.scala
diff --git a/tests/pending/run/reify_fors_oldpatmat.check b/tests/disabled/macro/run/reify_fors_oldpatmat.check
index eefddedc2..eefddedc2 100644
--- a/tests/pending/run/reify_fors_oldpatmat.check
+++ b/tests/disabled/macro/run/reify_fors_oldpatmat.check
diff --git a/tests/pending/run/reify_fors_oldpatmat.scala b/tests/disabled/macro/run/reify_fors_oldpatmat.scala
index d366169a4..d366169a4 100644
--- a/tests/pending/run/reify_fors_oldpatmat.scala
+++ b/tests/disabled/macro/run/reify_fors_oldpatmat.scala
diff --git a/tests/pending/run/reify_generic.check b/tests/disabled/macro/run/reify_generic.check
index b8626c4cf..b8626c4cf 100644
--- a/tests/pending/run/reify_generic.check
+++ b/tests/disabled/macro/run/reify_generic.check
diff --git a/tests/pending/run/reify_generic.scala b/tests/disabled/macro/run/reify_generic.scala
index 4221dbf6c..4221dbf6c 100644
--- a/tests/pending/run/reify_generic.scala
+++ b/tests/disabled/macro/run/reify_generic.scala
diff --git a/tests/pending/run/reify_generic2.check b/tests/disabled/macro/run/reify_generic2.check
index b8626c4cf..b8626c4cf 100644
--- a/tests/pending/run/reify_generic2.check
+++ b/tests/disabled/macro/run/reify_generic2.check
diff --git a/tests/pending/run/reify_generic2.scala b/tests/disabled/macro/run/reify_generic2.scala
index 6941d9ff7..6941d9ff7 100644
--- a/tests/pending/run/reify_generic2.scala
+++ b/tests/disabled/macro/run/reify_generic2.scala
diff --git a/tests/pending/run/reify_getter.check b/tests/disabled/macro/run/reify_getter.check
index 5ef4ff4d0..5ef4ff4d0 100644
--- a/tests/pending/run/reify_getter.check
+++ b/tests/disabled/macro/run/reify_getter.check
diff --git a/tests/pending/run/reify_getter.scala b/tests/disabled/macro/run/reify_getter.scala
index 18c9a1a32..18c9a1a32 100644
--- a/tests/pending/run/reify_getter.scala
+++ b/tests/disabled/macro/run/reify_getter.scala
diff --git a/tests/pending/run/reify_implicits-new.check b/tests/disabled/macro/run/reify_implicits-new.check
index e3aeb20f6..e3aeb20f6 100644
--- a/tests/pending/run/reify_implicits-new.check
+++ b/tests/disabled/macro/run/reify_implicits-new.check
diff --git a/tests/pending/run/reify_implicits-new.scala b/tests/disabled/macro/run/reify_implicits-new.scala
index 5ff90871a..5ff90871a 100644
--- a/tests/pending/run/reify_implicits-new.scala
+++ b/tests/disabled/macro/run/reify_implicits-new.scala
diff --git a/tests/pending/run/reify_implicits-old.check b/tests/disabled/macro/run/reify_implicits-old.check
index e3aeb20f6..e3aeb20f6 100644
--- a/tests/pending/run/reify_implicits-old.check
+++ b/tests/disabled/macro/run/reify_implicits-old.check
diff --git a/tests/pending/run/reify_implicits-old.scala b/tests/disabled/macro/run/reify_implicits-old.scala
index ccd9375d6..ccd9375d6 100644
--- a/tests/pending/run/reify_implicits-old.scala
+++ b/tests/disabled/macro/run/reify_implicits-old.scala
diff --git a/tests/pending/run/reify_inheritance.check b/tests/disabled/macro/run/reify_inheritance.check
index 25bf17fc5..25bf17fc5 100644
--- a/tests/pending/run/reify_inheritance.check
+++ b/tests/disabled/macro/run/reify_inheritance.check
diff --git a/tests/pending/run/reify_inheritance.scala b/tests/disabled/macro/run/reify_inheritance.scala
index f4fb49edc..f4fb49edc 100644
--- a/tests/pending/run/reify_inheritance.scala
+++ b/tests/disabled/macro/run/reify_inheritance.scala
diff --git a/tests/pending/run/reify_inner1.check b/tests/disabled/macro/run/reify_inner1.check
index d8263ee98..d8263ee98 100644
--- a/tests/pending/run/reify_inner1.check
+++ b/tests/disabled/macro/run/reify_inner1.check
diff --git a/tests/pending/run/reify_inner1.scala b/tests/disabled/macro/run/reify_inner1.scala
index bae49f910..bae49f910 100644
--- a/tests/pending/run/reify_inner1.scala
+++ b/tests/disabled/macro/run/reify_inner1.scala
diff --git a/tests/pending/run/reify_inner2.check b/tests/disabled/macro/run/reify_inner2.check
index d8263ee98..d8263ee98 100644
--- a/tests/pending/run/reify_inner2.check
+++ b/tests/disabled/macro/run/reify_inner2.check
diff --git a/tests/pending/run/reify_inner2.scala b/tests/disabled/macro/run/reify_inner2.scala
index fbe54b072..fbe54b072 100644
--- a/tests/pending/run/reify_inner2.scala
+++ b/tests/disabled/macro/run/reify_inner2.scala
diff --git a/tests/pending/run/reify_inner3.check b/tests/disabled/macro/run/reify_inner3.check
index d8263ee98..d8263ee98 100644
--- a/tests/pending/run/reify_inner3.check
+++ b/tests/disabled/macro/run/reify_inner3.check
diff --git a/tests/pending/run/reify_inner3.scala b/tests/disabled/macro/run/reify_inner3.scala
index 004041b7d..004041b7d 100644
--- a/tests/pending/run/reify_inner3.scala
+++ b/tests/disabled/macro/run/reify_inner3.scala
diff --git a/tests/pending/run/reify_inner4.check b/tests/disabled/macro/run/reify_inner4.check
index d8263ee98..d8263ee98 100644
--- a/tests/pending/run/reify_inner4.check
+++ b/tests/disabled/macro/run/reify_inner4.check
diff --git a/tests/pending/run/reify_inner4.scala b/tests/disabled/macro/run/reify_inner4.scala
index 5292cf040..5292cf040 100644
--- a/tests/pending/run/reify_inner4.scala
+++ b/tests/disabled/macro/run/reify_inner4.scala
diff --git a/tests/pending/run/reify_lazyevaluation.check b/tests/disabled/macro/run/reify_lazyevaluation.check
index 1c7f96cd9..1c7f96cd9 100644
--- a/tests/pending/run/reify_lazyevaluation.check
+++ b/tests/disabled/macro/run/reify_lazyevaluation.check
diff --git a/tests/pending/run/reify_lazyevaluation.scala b/tests/disabled/macro/run/reify_lazyevaluation.scala
index 564e7f1cd..564e7f1cd 100644
--- a/tests/pending/run/reify_lazyevaluation.scala
+++ b/tests/disabled/macro/run/reify_lazyevaluation.scala
diff --git a/tests/pending/run/reify_lazyunit.check b/tests/disabled/macro/run/reify_lazyunit.check
index 579ecfe8a..579ecfe8a 100644
--- a/tests/pending/run/reify_lazyunit.check
+++ b/tests/disabled/macro/run/reify_lazyunit.check
diff --git a/tests/pending/run/reify_lazyunit.scala b/tests/disabled/macro/run/reify_lazyunit.scala
index 70caf4f33..70caf4f33 100644
--- a/tests/pending/run/reify_lazyunit.scala
+++ b/tests/disabled/macro/run/reify_lazyunit.scala
diff --git a/tests/pending/run/reify_maps_newpatmat.check b/tests/disabled/macro/run/reify_maps_newpatmat.check
index 08cbbb135..08cbbb135 100644
--- a/tests/pending/run/reify_maps_newpatmat.check
+++ b/tests/disabled/macro/run/reify_maps_newpatmat.check
diff --git a/tests/pending/run/reify_maps_newpatmat.scala b/tests/disabled/macro/run/reify_maps_newpatmat.scala
index 18adb5c36..18adb5c36 100644
--- a/tests/pending/run/reify_maps_newpatmat.scala
+++ b/tests/disabled/macro/run/reify_maps_newpatmat.scala
diff --git a/tests/pending/run/reify_maps_oldpatmat.check b/tests/disabled/macro/run/reify_maps_oldpatmat.check
index 08cbbb135..08cbbb135 100644
--- a/tests/pending/run/reify_maps_oldpatmat.check
+++ b/tests/disabled/macro/run/reify_maps_oldpatmat.check
diff --git a/tests/pending/run/reify_maps_oldpatmat.scala b/tests/disabled/macro/run/reify_maps_oldpatmat.scala
index 18adb5c36..18adb5c36 100644
--- a/tests/pending/run/reify_maps_oldpatmat.scala
+++ b/tests/disabled/macro/run/reify_maps_oldpatmat.scala
diff --git a/tests/pending/run/reify_metalevel_breach_+0_refers_to_1.check b/tests/disabled/macro/run/reify_metalevel_breach_+0_refers_to_1.check
index 5bfed17f8..5bfed17f8 100644
--- a/tests/pending/run/reify_metalevel_breach_+0_refers_to_1.check
+++ b/tests/disabled/macro/run/reify_metalevel_breach_+0_refers_to_1.check
diff --git a/tests/pending/run/reify_metalevel_breach_+0_refers_to_1.scala b/tests/disabled/macro/run/reify_metalevel_breach_+0_refers_to_1.scala
index 2f930c25e..2f930c25e 100644
--- a/tests/pending/run/reify_metalevel_breach_+0_refers_to_1.scala
+++ b/tests/disabled/macro/run/reify_metalevel_breach_+0_refers_to_1.scala
diff --git a/tests/pending/run/reify_metalevel_breach_-1_refers_to_0_a.check b/tests/disabled/macro/run/reify_metalevel_breach_-1_refers_to_0_a.check
index 5bfed17f8..5bfed17f8 100644
--- a/tests/pending/run/reify_metalevel_breach_-1_refers_to_0_a.check
+++ b/tests/disabled/macro/run/reify_metalevel_breach_-1_refers_to_0_a.check
diff --git a/tests/pending/run/reify_metalevel_breach_-1_refers_to_0_a.scala b/tests/disabled/macro/run/reify_metalevel_breach_-1_refers_to_0_a.scala
index 526ed3d13..526ed3d13 100644
--- a/tests/pending/run/reify_metalevel_breach_-1_refers_to_0_a.scala
+++ b/tests/disabled/macro/run/reify_metalevel_breach_-1_refers_to_0_a.scala
diff --git a/tests/pending/run/reify_metalevel_breach_-1_refers_to_0_b.check b/tests/disabled/macro/run/reify_metalevel_breach_-1_refers_to_0_b.check
index 5bfed17f8..5bfed17f8 100644
--- a/tests/pending/run/reify_metalevel_breach_-1_refers_to_0_b.check
+++ b/tests/disabled/macro/run/reify_metalevel_breach_-1_refers_to_0_b.check
diff --git a/tests/pending/run/reify_metalevel_breach_-1_refers_to_0_b.scala b/tests/disabled/macro/run/reify_metalevel_breach_-1_refers_to_0_b.scala
index 96793c634..96793c634 100644
--- a/tests/pending/run/reify_metalevel_breach_-1_refers_to_0_b.scala
+++ b/tests/disabled/macro/run/reify_metalevel_breach_-1_refers_to_0_b.scala
diff --git a/tests/pending/run/reify_metalevel_breach_-1_refers_to_1.check b/tests/disabled/macro/run/reify_metalevel_breach_-1_refers_to_1.check
index 5bfed17f8..5bfed17f8 100644
--- a/tests/pending/run/reify_metalevel_breach_-1_refers_to_1.check
+++ b/tests/disabled/macro/run/reify_metalevel_breach_-1_refers_to_1.check
diff --git a/tests/pending/run/reify_metalevel_breach_-1_refers_to_1.scala b/tests/disabled/macro/run/reify_metalevel_breach_-1_refers_to_1.scala
index 0fc985b6a..0fc985b6a 100644
--- a/tests/pending/run/reify_metalevel_breach_-1_refers_to_1.scala
+++ b/tests/disabled/macro/run/reify_metalevel_breach_-1_refers_to_1.scala
diff --git a/tests/pending/run/reify_nested_inner_refers_to_global.check b/tests/disabled/macro/run/reify_nested_inner_refers_to_global.check
index 5ef4ff4d0..5ef4ff4d0 100644
--- a/tests/pending/run/reify_nested_inner_refers_to_global.check
+++ b/tests/disabled/macro/run/reify_nested_inner_refers_to_global.check
diff --git a/tests/pending/run/reify_nested_inner_refers_to_global.scala b/tests/disabled/macro/run/reify_nested_inner_refers_to_global.scala
index 41d378e91..41d378e91 100644
--- a/tests/pending/run/reify_nested_inner_refers_to_global.scala
+++ b/tests/disabled/macro/run/reify_nested_inner_refers_to_global.scala
diff --git a/tests/pending/run/reify_nested_inner_refers_to_local.check b/tests/disabled/macro/run/reify_nested_inner_refers_to_local.check
index 5bfed17f8..5bfed17f8 100644
--- a/tests/pending/run/reify_nested_inner_refers_to_local.check
+++ b/tests/disabled/macro/run/reify_nested_inner_refers_to_local.check
diff --git a/tests/pending/run/reify_nested_inner_refers_to_local.scala b/tests/disabled/macro/run/reify_nested_inner_refers_to_local.scala
index 102278c84..102278c84 100644
--- a/tests/pending/run/reify_nested_inner_refers_to_local.scala
+++ b/tests/disabled/macro/run/reify_nested_inner_refers_to_local.scala
diff --git a/tests/pending/run/reify_nested_outer_refers_to_global.check b/tests/disabled/macro/run/reify_nested_outer_refers_to_global.check
index 5ef4ff4d0..5ef4ff4d0 100644
--- a/tests/pending/run/reify_nested_outer_refers_to_global.check
+++ b/tests/disabled/macro/run/reify_nested_outer_refers_to_global.check
diff --git a/tests/pending/run/reify_nested_outer_refers_to_global.scala b/tests/disabled/macro/run/reify_nested_outer_refers_to_global.scala
index bff5dc407..bff5dc407 100644
--- a/tests/pending/run/reify_nested_outer_refers_to_global.scala
+++ b/tests/disabled/macro/run/reify_nested_outer_refers_to_global.scala
diff --git a/tests/pending/run/reify_nested_outer_refers_to_local.check b/tests/disabled/macro/run/reify_nested_outer_refers_to_local.check
index 5ef4ff4d0..5ef4ff4d0 100644
--- a/tests/pending/run/reify_nested_outer_refers_to_local.check
+++ b/tests/disabled/macro/run/reify_nested_outer_refers_to_local.check
diff --git a/tests/pending/run/reify_nested_outer_refers_to_local.scala b/tests/disabled/macro/run/reify_nested_outer_refers_to_local.scala
index 70c400bc2..70c400bc2 100644
--- a/tests/pending/run/reify_nested_outer_refers_to_local.scala
+++ b/tests/disabled/macro/run/reify_nested_outer_refers_to_local.scala
diff --git a/tests/pending/run/reify_newimpl_01.check b/tests/disabled/macro/run/reify_newimpl_01.check
index d8263ee98..d8263ee98 100644
--- a/tests/pending/run/reify_newimpl_01.check
+++ b/tests/disabled/macro/run/reify_newimpl_01.check
diff --git a/tests/pending/run/reify_newimpl_01.scala b/tests/disabled/macro/run/reify_newimpl_01.scala
index 1a5f96b53..1a5f96b53 100644
--- a/tests/pending/run/reify_newimpl_01.scala
+++ b/tests/disabled/macro/run/reify_newimpl_01.scala
diff --git a/tests/pending/run/reify_newimpl_02.check b/tests/disabled/macro/run/reify_newimpl_02.check
index d8263ee98..d8263ee98 100644
--- a/tests/pending/run/reify_newimpl_02.check
+++ b/tests/disabled/macro/run/reify_newimpl_02.check
diff --git a/tests/pending/run/reify_newimpl_02.scala b/tests/disabled/macro/run/reify_newimpl_02.scala
index 1ef3f03ed..1ef3f03ed 100644
--- a/tests/pending/run/reify_newimpl_02.scala
+++ b/tests/disabled/macro/run/reify_newimpl_02.scala
diff --git a/tests/pending/run/reify_newimpl_03.check b/tests/disabled/macro/run/reify_newimpl_03.check
index d8263ee98..d8263ee98 100644
--- a/tests/pending/run/reify_newimpl_03.check
+++ b/tests/disabled/macro/run/reify_newimpl_03.check
diff --git a/tests/pending/run/reify_newimpl_03.scala b/tests/disabled/macro/run/reify_newimpl_03.scala
index 531bc76fe..531bc76fe 100644
--- a/tests/pending/run/reify_newimpl_03.scala
+++ b/tests/disabled/macro/run/reify_newimpl_03.scala
diff --git a/tests/pending/run/reify_newimpl_04.check b/tests/disabled/macro/run/reify_newimpl_04.check
index d8263ee98..d8263ee98 100644
--- a/tests/pending/run/reify_newimpl_04.check
+++ b/tests/disabled/macro/run/reify_newimpl_04.check
diff --git a/tests/pending/run/reify_newimpl_04.scala b/tests/disabled/macro/run/reify_newimpl_04.scala
index b6071f843..b6071f843 100644
--- a/tests/pending/run/reify_newimpl_04.scala
+++ b/tests/disabled/macro/run/reify_newimpl_04.scala
diff --git a/tests/pending/run/reify_newimpl_05.check b/tests/disabled/macro/run/reify_newimpl_05.check
index d8263ee98..d8263ee98 100644
--- a/tests/pending/run/reify_newimpl_05.check
+++ b/tests/disabled/macro/run/reify_newimpl_05.check
diff --git a/tests/pending/run/reify_newimpl_05.scala b/tests/disabled/macro/run/reify_newimpl_05.scala
index 0ff5bb07c..0ff5bb07c 100644
--- a/tests/pending/run/reify_newimpl_05.scala
+++ b/tests/disabled/macro/run/reify_newimpl_05.scala
diff --git a/tests/pending/run/reify_newimpl_06.check b/tests/disabled/macro/run/reify_newimpl_06.check
index d8263ee98..d8263ee98 100644
--- a/tests/pending/run/reify_newimpl_06.check
+++ b/tests/disabled/macro/run/reify_newimpl_06.check
diff --git a/tests/pending/run/reify_newimpl_06.scala b/tests/disabled/macro/run/reify_newimpl_06.scala
index 8743da100..8743da100 100644
--- a/tests/pending/run/reify_newimpl_06.scala
+++ b/tests/disabled/macro/run/reify_newimpl_06.scala
diff --git a/tests/pending/run/reify_newimpl_11.check b/tests/disabled/macro/run/reify_newimpl_11.check
index c019c6db2..c019c6db2 100644
--- a/tests/pending/run/reify_newimpl_11.check
+++ b/tests/disabled/macro/run/reify_newimpl_11.check
diff --git a/tests/pending/run/reify_newimpl_11.scala b/tests/disabled/macro/run/reify_newimpl_11.scala
index bb08808c2..bb08808c2 100644
--- a/tests/pending/run/reify_newimpl_11.scala
+++ b/tests/disabled/macro/run/reify_newimpl_11.scala
diff --git a/tests/pending/run/reify_newimpl_12.check b/tests/disabled/macro/run/reify_newimpl_12.check
index 220bd6875..220bd6875 100644
--- a/tests/pending/run/reify_newimpl_12.check
+++ b/tests/disabled/macro/run/reify_newimpl_12.check
diff --git a/tests/pending/run/reify_newimpl_12.scala b/tests/disabled/macro/run/reify_newimpl_12.scala
index c2b9d42ca..c2b9d42ca 100644
--- a/tests/pending/run/reify_newimpl_12.scala
+++ b/tests/disabled/macro/run/reify_newimpl_12.scala
diff --git a/tests/pending/run/reify_newimpl_13.check b/tests/disabled/macro/run/reify_newimpl_13.check
index 13e3c9af1..13e3c9af1 100644
--- a/tests/pending/run/reify_newimpl_13.check
+++ b/tests/disabled/macro/run/reify_newimpl_13.check
diff --git a/tests/pending/run/reify_newimpl_13.scala b/tests/disabled/macro/run/reify_newimpl_13.scala
index 79a99c334..79a99c334 100644
--- a/tests/pending/run/reify_newimpl_13.scala
+++ b/tests/disabled/macro/run/reify_newimpl_13.scala
diff --git a/tests/pending/run/reify_newimpl_14.check b/tests/disabled/macro/run/reify_newimpl_14.check
index 220bd6875..220bd6875 100644
--- a/tests/pending/run/reify_newimpl_14.check
+++ b/tests/disabled/macro/run/reify_newimpl_14.check
diff --git a/tests/pending/run/reify_newimpl_14.scala b/tests/disabled/macro/run/reify_newimpl_14.scala
index af2c7f136..af2c7f136 100644
--- a/tests/pending/run/reify_newimpl_14.scala
+++ b/tests/disabled/macro/run/reify_newimpl_14.scala
diff --git a/tests/pending/run/reify_newimpl_15.check b/tests/disabled/macro/run/reify_newimpl_15.check
index 220bd6875..220bd6875 100644
--- a/tests/pending/run/reify_newimpl_15.check
+++ b/tests/disabled/macro/run/reify_newimpl_15.check
diff --git a/tests/pending/run/reify_newimpl_15.scala b/tests/disabled/macro/run/reify_newimpl_15.scala
index 4bcfc7107..4bcfc7107 100644
--- a/tests/pending/run/reify_newimpl_15.scala
+++ b/tests/disabled/macro/run/reify_newimpl_15.scala
diff --git a/tests/pending/run/reify_newimpl_18.check b/tests/disabled/macro/run/reify_newimpl_18.check
index c23af69b0..c23af69b0 100644
--- a/tests/pending/run/reify_newimpl_18.check
+++ b/tests/disabled/macro/run/reify_newimpl_18.check
diff --git a/tests/pending/run/reify_newimpl_18.scala b/tests/disabled/macro/run/reify_newimpl_18.scala
index e60bed8c7..e60bed8c7 100644
--- a/tests/pending/run/reify_newimpl_18.scala
+++ b/tests/disabled/macro/run/reify_newimpl_18.scala
diff --git a/tests/pending/run/reify_newimpl_19.check b/tests/disabled/macro/run/reify_newimpl_19.check
index c749d4f10..c749d4f10 100644
--- a/tests/pending/run/reify_newimpl_19.check
+++ b/tests/disabled/macro/run/reify_newimpl_19.check
diff --git a/tests/pending/run/reify_newimpl_19.scala b/tests/disabled/macro/run/reify_newimpl_19.scala
index eaa6ca206..eaa6ca206 100644
--- a/tests/pending/run/reify_newimpl_19.scala
+++ b/tests/disabled/macro/run/reify_newimpl_19.scala
diff --git a/tests/pending/run/reify_newimpl_20.check b/tests/disabled/macro/run/reify_newimpl_20.check
index c23af69b0..c23af69b0 100644
--- a/tests/pending/run/reify_newimpl_20.check
+++ b/tests/disabled/macro/run/reify_newimpl_20.check
diff --git a/tests/pending/run/reify_newimpl_20.scala b/tests/disabled/macro/run/reify_newimpl_20.scala
index c483e0b7e..c483e0b7e 100644
--- a/tests/pending/run/reify_newimpl_20.scala
+++ b/tests/disabled/macro/run/reify_newimpl_20.scala
diff --git a/tests/pending/run/reify_newimpl_21.check b/tests/disabled/macro/run/reify_newimpl_21.check
index c23af69b0..c23af69b0 100644
--- a/tests/pending/run/reify_newimpl_21.check
+++ b/tests/disabled/macro/run/reify_newimpl_21.check
diff --git a/tests/pending/run/reify_newimpl_21.scala b/tests/disabled/macro/run/reify_newimpl_21.scala
index 0875ede6b..0875ede6b 100644
--- a/tests/pending/run/reify_newimpl_21.scala
+++ b/tests/disabled/macro/run/reify_newimpl_21.scala
diff --git a/tests/pending/run/reify_newimpl_22.check b/tests/disabled/macro/run/reify_newimpl_22.check
index 952f384a1..952f384a1 100644
--- a/tests/pending/run/reify_newimpl_22.check
+++ b/tests/disabled/macro/run/reify_newimpl_22.check
diff --git a/tests/pending/run/reify_newimpl_22.scala b/tests/disabled/macro/run/reify_newimpl_22.scala
index 8512620a1..8512620a1 100644
--- a/tests/pending/run/reify_newimpl_22.scala
+++ b/tests/disabled/macro/run/reify_newimpl_22.scala
diff --git a/tests/pending/run/reify_newimpl_23.check b/tests/disabled/macro/run/reify_newimpl_23.check
index b7e9bfdfb..b7e9bfdfb 100644
--- a/tests/pending/run/reify_newimpl_23.check
+++ b/tests/disabled/macro/run/reify_newimpl_23.check
diff --git a/tests/pending/run/reify_newimpl_23.scala b/tests/disabled/macro/run/reify_newimpl_23.scala
index d4c2a68ce..d4c2a68ce 100644
--- a/tests/pending/run/reify_newimpl_23.scala
+++ b/tests/disabled/macro/run/reify_newimpl_23.scala
diff --git a/tests/pending/run/reify_newimpl_27.check b/tests/disabled/macro/run/reify_newimpl_27.check
index c23af69b0..c23af69b0 100644
--- a/tests/pending/run/reify_newimpl_27.check
+++ b/tests/disabled/macro/run/reify_newimpl_27.check
diff --git a/tests/pending/run/reify_newimpl_27.scala b/tests/disabled/macro/run/reify_newimpl_27.scala
index 332dbec91..332dbec91 100644
--- a/tests/pending/run/reify_newimpl_27.scala
+++ b/tests/disabled/macro/run/reify_newimpl_27.scala
diff --git a/tests/pending/run/reify_newimpl_29.check b/tests/disabled/macro/run/reify_newimpl_29.check
index c23af69b0..c23af69b0 100644
--- a/tests/pending/run/reify_newimpl_29.check
+++ b/tests/disabled/macro/run/reify_newimpl_29.check
diff --git a/tests/pending/run/reify_newimpl_29.scala b/tests/disabled/macro/run/reify_newimpl_29.scala
index 1865075f4..1865075f4 100644
--- a/tests/pending/run/reify_newimpl_29.scala
+++ b/tests/disabled/macro/run/reify_newimpl_29.scala
diff --git a/tests/pending/run/reify_newimpl_30.check b/tests/disabled/macro/run/reify_newimpl_30.check
index 7557c750a..7557c750a 100644
--- a/tests/pending/run/reify_newimpl_30.check
+++ b/tests/disabled/macro/run/reify_newimpl_30.check
diff --git a/tests/pending/run/reify_newimpl_30.scala b/tests/disabled/macro/run/reify_newimpl_30.scala
index afc199d50..afc199d50 100644
--- a/tests/pending/run/reify_newimpl_30.scala
+++ b/tests/disabled/macro/run/reify_newimpl_30.scala
diff --git a/tests/pending/run/reify_newimpl_31.check b/tests/disabled/macro/run/reify_newimpl_31.check
index c23af69b0..c23af69b0 100644
--- a/tests/pending/run/reify_newimpl_31.check
+++ b/tests/disabled/macro/run/reify_newimpl_31.check
diff --git a/tests/pending/run/reify_newimpl_31.scala b/tests/disabled/macro/run/reify_newimpl_31.scala
index 535c9b67b..535c9b67b 100644
--- a/tests/pending/run/reify_newimpl_31.scala
+++ b/tests/disabled/macro/run/reify_newimpl_31.scala
diff --git a/tests/pending/run/reify_newimpl_33.check b/tests/disabled/macro/run/reify_newimpl_33.check
index c23af69b0..c23af69b0 100644
--- a/tests/pending/run/reify_newimpl_33.check
+++ b/tests/disabled/macro/run/reify_newimpl_33.check
diff --git a/tests/pending/run/reify_newimpl_33.scala b/tests/disabled/macro/run/reify_newimpl_33.scala
index 55a808eda..55a808eda 100644
--- a/tests/pending/run/reify_newimpl_33.scala
+++ b/tests/disabled/macro/run/reify_newimpl_33.scala
diff --git a/tests/pending/run/reify_newimpl_35.check b/tests/disabled/macro/run/reify_newimpl_35.check
index bd9b3a2fb..bd9b3a2fb 100644
--- a/tests/pending/run/reify_newimpl_35.check
+++ b/tests/disabled/macro/run/reify_newimpl_35.check
diff --git a/tests/pending/run/reify_newimpl_35.scala b/tests/disabled/macro/run/reify_newimpl_35.scala
index f2ebf5181..f2ebf5181 100644
--- a/tests/pending/run/reify_newimpl_35.scala
+++ b/tests/disabled/macro/run/reify_newimpl_35.scala
diff --git a/tests/pending/run/reify_newimpl_36.check b/tests/disabled/macro/run/reify_newimpl_36.check
index d81cc0710..d81cc0710 100644
--- a/tests/pending/run/reify_newimpl_36.check
+++ b/tests/disabled/macro/run/reify_newimpl_36.check
diff --git a/tests/pending/run/reify_newimpl_36.scala b/tests/disabled/macro/run/reify_newimpl_36.scala
index 19f8617c6..19f8617c6 100644
--- a/tests/pending/run/reify_newimpl_36.scala
+++ b/tests/disabled/macro/run/reify_newimpl_36.scala
diff --git a/tests/pending/run/reify_newimpl_37.check b/tests/disabled/macro/run/reify_newimpl_37.check
index d81cc0710..d81cc0710 100644
--- a/tests/pending/run/reify_newimpl_37.check
+++ b/tests/disabled/macro/run/reify_newimpl_37.check
diff --git a/tests/pending/run/reify_newimpl_37.scala b/tests/disabled/macro/run/reify_newimpl_37.scala
index 5eeda2125..5eeda2125 100644
--- a/tests/pending/run/reify_newimpl_37.scala
+++ b/tests/disabled/macro/run/reify_newimpl_37.scala
diff --git a/tests/pending/run/reify_newimpl_38.check b/tests/disabled/macro/run/reify_newimpl_38.check
index d81cc0710..d81cc0710 100644
--- a/tests/pending/run/reify_newimpl_38.check
+++ b/tests/disabled/macro/run/reify_newimpl_38.check
diff --git a/tests/pending/run/reify_newimpl_38.scala b/tests/disabled/macro/run/reify_newimpl_38.scala
index a313b7d8d..a313b7d8d 100644
--- a/tests/pending/run/reify_newimpl_38.scala
+++ b/tests/disabled/macro/run/reify_newimpl_38.scala
diff --git a/tests/pending/run/reify_newimpl_39.check b/tests/disabled/macro/run/reify_newimpl_39.check
index d81cc0710..d81cc0710 100644
--- a/tests/pending/run/reify_newimpl_39.check
+++ b/tests/disabled/macro/run/reify_newimpl_39.check
diff --git a/tests/pending/run/reify_newimpl_39.scala b/tests/disabled/macro/run/reify_newimpl_39.scala
index 4b779fc07..4b779fc07 100644
--- a/tests/pending/run/reify_newimpl_39.scala
+++ b/tests/disabled/macro/run/reify_newimpl_39.scala
diff --git a/tests/pending/run/reify_newimpl_40.check b/tests/disabled/macro/run/reify_newimpl_40.check
index cc0001ab3..cc0001ab3 100644
--- a/tests/pending/run/reify_newimpl_40.check
+++ b/tests/disabled/macro/run/reify_newimpl_40.check
diff --git a/tests/pending/run/reify_newimpl_40.scala b/tests/disabled/macro/run/reify_newimpl_40.scala
index 1bc37973f..1bc37973f 100644
--- a/tests/pending/run/reify_newimpl_40.scala
+++ b/tests/disabled/macro/run/reify_newimpl_40.scala
diff --git a/tests/pending/run/reify_newimpl_41.check b/tests/disabled/macro/run/reify_newimpl_41.check
index 0b427f2ee..0b427f2ee 100644
--- a/tests/pending/run/reify_newimpl_41.check
+++ b/tests/disabled/macro/run/reify_newimpl_41.check
diff --git a/tests/pending/run/reify_newimpl_41.scala b/tests/disabled/macro/run/reify_newimpl_41.scala
index 514e206a3..514e206a3 100644
--- a/tests/pending/run/reify_newimpl_41.scala
+++ b/tests/disabled/macro/run/reify_newimpl_41.scala
diff --git a/tests/pending/run/reify_newimpl_42.check b/tests/disabled/macro/run/reify_newimpl_42.check
index 0b427f2ee..0b427f2ee 100644
--- a/tests/pending/run/reify_newimpl_42.check
+++ b/tests/disabled/macro/run/reify_newimpl_42.check
diff --git a/tests/pending/run/reify_newimpl_42.scala b/tests/disabled/macro/run/reify_newimpl_42.scala
index 64c1cf345..64c1cf345 100644
--- a/tests/pending/run/reify_newimpl_42.scala
+++ b/tests/disabled/macro/run/reify_newimpl_42.scala
diff --git a/tests/pending/run/reify_newimpl_43.check b/tests/disabled/macro/run/reify_newimpl_43.check
index 7a754f414..7a754f414 100644
--- a/tests/pending/run/reify_newimpl_43.check
+++ b/tests/disabled/macro/run/reify_newimpl_43.check
diff --git a/tests/pending/run/reify_newimpl_43.scala b/tests/disabled/macro/run/reify_newimpl_43.scala
index 736536cb3..736536cb3 100644
--- a/tests/pending/run/reify_newimpl_43.scala
+++ b/tests/disabled/macro/run/reify_newimpl_43.scala
diff --git a/tests/pending/run/reify_newimpl_44.check b/tests/disabled/macro/run/reify_newimpl_44.check
index 7a754f414..7a754f414 100644
--- a/tests/pending/run/reify_newimpl_44.check
+++ b/tests/disabled/macro/run/reify_newimpl_44.check
diff --git a/tests/pending/run/reify_newimpl_44.scala b/tests/disabled/macro/run/reify_newimpl_44.scala
index 736536cb3..736536cb3 100644
--- a/tests/pending/run/reify_newimpl_44.scala
+++ b/tests/disabled/macro/run/reify_newimpl_44.scala
diff --git a/tests/pending/run/reify_newimpl_45.check b/tests/disabled/macro/run/reify_newimpl_45.check
index 6e14f71e2..6e14f71e2 100644
--- a/tests/pending/run/reify_newimpl_45.check
+++ b/tests/disabled/macro/run/reify_newimpl_45.check
diff --git a/tests/pending/run/reify_newimpl_45.scala b/tests/disabled/macro/run/reify_newimpl_45.scala
index cfda46a6a..cfda46a6a 100644
--- a/tests/pending/run/reify_newimpl_45.scala
+++ b/tests/disabled/macro/run/reify_newimpl_45.scala
diff --git a/tests/pending/run/reify_newimpl_47.check b/tests/disabled/macro/run/reify_newimpl_47.check
index d8263ee98..d8263ee98 100644
--- a/tests/pending/run/reify_newimpl_47.check
+++ b/tests/disabled/macro/run/reify_newimpl_47.check
diff --git a/tests/pending/run/reify_newimpl_47.scala b/tests/disabled/macro/run/reify_newimpl_47.scala
index c0ad6cbe5..c0ad6cbe5 100644
--- a/tests/pending/run/reify_newimpl_47.scala
+++ b/tests/disabled/macro/run/reify_newimpl_47.scala
diff --git a/tests/pending/run/reify_newimpl_48.check b/tests/disabled/macro/run/reify_newimpl_48.check
index f11c82a4c..f11c82a4c 100644
--- a/tests/pending/run/reify_newimpl_48.check
+++ b/tests/disabled/macro/run/reify_newimpl_48.check
diff --git a/tests/pending/run/reify_newimpl_48.scala b/tests/disabled/macro/run/reify_newimpl_48.scala
index 7d1c1d642..7d1c1d642 100644
--- a/tests/pending/run/reify_newimpl_48.scala
+++ b/tests/disabled/macro/run/reify_newimpl_48.scala
diff --git a/tests/pending/run/reify_newimpl_49.check b/tests/disabled/macro/run/reify_newimpl_49.check
index d8a621df0..d8a621df0 100644
--- a/tests/pending/run/reify_newimpl_49.check
+++ b/tests/disabled/macro/run/reify_newimpl_49.check
diff --git a/tests/pending/run/reify_newimpl_49.scala b/tests/disabled/macro/run/reify_newimpl_49.scala
index 61ddfafa3..61ddfafa3 100644
--- a/tests/pending/run/reify_newimpl_49.scala
+++ b/tests/disabled/macro/run/reify_newimpl_49.scala
diff --git a/tests/pending/run/reify_newimpl_50.check b/tests/disabled/macro/run/reify_newimpl_50.check
index d8a621df0..d8a621df0 100644
--- a/tests/pending/run/reify_newimpl_50.check
+++ b/tests/disabled/macro/run/reify_newimpl_50.check
diff --git a/tests/pending/run/reify_newimpl_50.scala b/tests/disabled/macro/run/reify_newimpl_50.scala
index 8ecdeb55c..8ecdeb55c 100644
--- a/tests/pending/run/reify_newimpl_50.scala
+++ b/tests/disabled/macro/run/reify_newimpl_50.scala
diff --git a/tests/pending/run/reify_newimpl_51.check b/tests/disabled/macro/run/reify_newimpl_51.check
index 9a4ddeacd..9a4ddeacd 100644
--- a/tests/pending/run/reify_newimpl_51.check
+++ b/tests/disabled/macro/run/reify_newimpl_51.check
diff --git a/tests/pending/run/reify_newimpl_51.scala b/tests/disabled/macro/run/reify_newimpl_51.scala
index 8a4a325f0..8a4a325f0 100644
--- a/tests/pending/run/reify_newimpl_51.scala
+++ b/tests/disabled/macro/run/reify_newimpl_51.scala
diff --git a/tests/pending/run/reify_newimpl_52.check b/tests/disabled/macro/run/reify_newimpl_52.check
index 9359a2b21..9359a2b21 100644
--- a/tests/pending/run/reify_newimpl_52.check
+++ b/tests/disabled/macro/run/reify_newimpl_52.check
diff --git a/tests/pending/run/reify_newimpl_52.scala b/tests/disabled/macro/run/reify_newimpl_52.scala
index 4dc82b145..4dc82b145 100644
--- a/tests/pending/run/reify_newimpl_52.scala
+++ b/tests/disabled/macro/run/reify_newimpl_52.scala
diff --git a/tests/pending/run/reify_printf.check b/tests/disabled/macro/run/reify_printf.check
index 3b18e512d..3b18e512d 100644
--- a/tests/pending/run/reify_printf.check
+++ b/tests/disabled/macro/run/reify_printf.check
diff --git a/tests/pending/run/reify_printf.scala b/tests/disabled/macro/run/reify_printf.scala
index b957c41bb..b957c41bb 100644
--- a/tests/pending/run/reify_printf.scala
+++ b/tests/disabled/macro/run/reify_printf.scala
diff --git a/tests/pending/run/reify_properties.check b/tests/disabled/macro/run/reify_properties.check
index d769bea4b..d769bea4b 100644
--- a/tests/pending/run/reify_properties.check
+++ b/tests/disabled/macro/run/reify_properties.check
diff --git a/tests/pending/run/reify_properties.scala b/tests/disabled/macro/run/reify_properties.scala
index b6ce5f305..b6ce5f305 100644
--- a/tests/pending/run/reify_properties.scala
+++ b/tests/disabled/macro/run/reify_properties.scala
diff --git a/tests/pending/run/reify_renamed_term_basic.check b/tests/disabled/macro/run/reify_renamed_term_basic.check
index e78f94fff..e78f94fff 100644
--- a/tests/pending/run/reify_renamed_term_basic.check
+++ b/tests/disabled/macro/run/reify_renamed_term_basic.check
diff --git a/tests/pending/run/reify_renamed_term_basic.scala b/tests/disabled/macro/run/reify_renamed_term_basic.scala
index 7971d3d11..7971d3d11 100644
--- a/tests/pending/run/reify_renamed_term_basic.scala
+++ b/tests/disabled/macro/run/reify_renamed_term_basic.scala
diff --git a/tests/pending/run/reify_renamed_term_local_to_reifee.check b/tests/disabled/macro/run/reify_renamed_term_local_to_reifee.check
index e78f94fff..e78f94fff 100644
--- a/tests/pending/run/reify_renamed_term_local_to_reifee.check
+++ b/tests/disabled/macro/run/reify_renamed_term_local_to_reifee.check
diff --git a/tests/pending/run/reify_renamed_term_local_to_reifee.scala b/tests/disabled/macro/run/reify_renamed_term_local_to_reifee.scala
index b93279376..b93279376 100644
--- a/tests/pending/run/reify_renamed_term_local_to_reifee.scala
+++ b/tests/disabled/macro/run/reify_renamed_term_local_to_reifee.scala
diff --git a/tests/pending/run/reify_renamed_term_overloaded_method.check b/tests/disabled/macro/run/reify_renamed_term_overloaded_method.check
index 48082f72f..48082f72f 100644
--- a/tests/pending/run/reify_renamed_term_overloaded_method.check
+++ b/tests/disabled/macro/run/reify_renamed_term_overloaded_method.check
diff --git a/tests/pending/run/reify_renamed_term_overloaded_method.scala b/tests/disabled/macro/run/reify_renamed_term_overloaded_method.scala
index 1f7897679..1f7897679 100644
--- a/tests/pending/run/reify_renamed_term_overloaded_method.scala
+++ b/tests/disabled/macro/run/reify_renamed_term_overloaded_method.scala
diff --git a/tests/pending/run/reify_renamed_term_t5841.check b/tests/disabled/macro/run/reify_renamed_term_t5841.check
index 6031277b7..6031277b7 100644
--- a/tests/pending/run/reify_renamed_term_t5841.check
+++ b/tests/disabled/macro/run/reify_renamed_term_t5841.check
diff --git a/tests/pending/run/reify_renamed_term_t5841.scala b/tests/disabled/macro/run/reify_renamed_term_t5841.scala
index d4c051c1b..d4c051c1b 100644
--- a/tests/pending/run/reify_renamed_term_t5841.scala
+++ b/tests/disabled/macro/run/reify_renamed_term_t5841.scala
diff --git a/tests/pending/run/reify_renamed_type_basic.check b/tests/disabled/macro/run/reify_renamed_type_basic.check
index 6a452c185..6a452c185 100644
--- a/tests/pending/run/reify_renamed_type_basic.check
+++ b/tests/disabled/macro/run/reify_renamed_type_basic.check
diff --git a/tests/pending/run/reify_renamed_type_basic.scala b/tests/disabled/macro/run/reify_renamed_type_basic.scala
index 50506e144..50506e144 100644
--- a/tests/pending/run/reify_renamed_type_basic.scala
+++ b/tests/disabled/macro/run/reify_renamed_type_basic.scala
diff --git a/tests/pending/run/reify_renamed_type_local_to_reifee.check b/tests/disabled/macro/run/reify_renamed_type_local_to_reifee.check
index 6a452c185..6a452c185 100644
--- a/tests/pending/run/reify_renamed_type_local_to_reifee.check
+++ b/tests/disabled/macro/run/reify_renamed_type_local_to_reifee.check
diff --git a/tests/pending/run/reify_renamed_type_local_to_reifee.scala b/tests/disabled/macro/run/reify_renamed_type_local_to_reifee.scala
index 01280e993..01280e993 100644
--- a/tests/pending/run/reify_renamed_type_local_to_reifee.scala
+++ b/tests/disabled/macro/run/reify_renamed_type_local_to_reifee.scala
diff --git a/tests/pending/run/reify_renamed_type_spliceable.check b/tests/disabled/macro/run/reify_renamed_type_spliceable.check
index 6a452c185..6a452c185 100644
--- a/tests/pending/run/reify_renamed_type_spliceable.check
+++ b/tests/disabled/macro/run/reify_renamed_type_spliceable.check
diff --git a/tests/pending/run/reify_renamed_type_spliceable.scala b/tests/disabled/macro/run/reify_renamed_type_spliceable.scala
index 6a34d1722..6a34d1722 100644
--- a/tests/pending/run/reify_renamed_type_spliceable.scala
+++ b/tests/disabled/macro/run/reify_renamed_type_spliceable.scala
diff --git a/tests/pending/run/reify_sort.check b/tests/disabled/macro/run/reify_sort.check
index 375536cc2..375536cc2 100644
--- a/tests/pending/run/reify_sort.check
+++ b/tests/disabled/macro/run/reify_sort.check
diff --git a/tests/pending/run/reify_sort.scala b/tests/disabled/macro/run/reify_sort.scala
index b484111ed..b484111ed 100644
--- a/tests/pending/run/reify_sort.scala
+++ b/tests/disabled/macro/run/reify_sort.scala
diff --git a/tests/pending/run/reify_sort1.check b/tests/disabled/macro/run/reify_sort1.check
index 0d3080514..0d3080514 100644
--- a/tests/pending/run/reify_sort1.check
+++ b/tests/disabled/macro/run/reify_sort1.check
diff --git a/tests/pending/run/reify_sort1.scala b/tests/disabled/macro/run/reify_sort1.scala
index 24ca06283..24ca06283 100644
--- a/tests/pending/run/reify_sort1.scala
+++ b/tests/disabled/macro/run/reify_sort1.scala
diff --git a/tests/pending/run/reify_this.check b/tests/disabled/macro/run/reify_this.check
index af3d0652a..af3d0652a 100644
--- a/tests/pending/run/reify_this.check
+++ b/tests/disabled/macro/run/reify_this.check
diff --git a/tests/pending/run/reify_this.scala b/tests/disabled/macro/run/reify_this.scala
index 339fcca54..339fcca54 100644
--- a/tests/pending/run/reify_this.scala
+++ b/tests/disabled/macro/run/reify_this.scala
diff --git a/tests/pending/run/reify_timeofday.check b/tests/disabled/macro/run/reify_timeofday.check
index 3fd3b76a6..3fd3b76a6 100644
--- a/tests/pending/run/reify_timeofday.check
+++ b/tests/disabled/macro/run/reify_timeofday.check
diff --git a/tests/pending/run/reify_timeofday.scala b/tests/disabled/macro/run/reify_timeofday.scala
index ff30a962b..ff30a962b 100644
--- a/tests/pending/run/reify_timeofday.scala
+++ b/tests/disabled/macro/run/reify_timeofday.scala
diff --git a/tests/pending/run/reify_typerefs_1a.check b/tests/disabled/macro/run/reify_typerefs_1a.check
index 919c298ba..919c298ba 100644
--- a/tests/pending/run/reify_typerefs_1a.check
+++ b/tests/disabled/macro/run/reify_typerefs_1a.check
diff --git a/tests/pending/run/reify_typerefs_1a.scala b/tests/disabled/macro/run/reify_typerefs_1a.scala
index b4f608a95..b4f608a95 100644
--- a/tests/pending/run/reify_typerefs_1a.scala
+++ b/tests/disabled/macro/run/reify_typerefs_1a.scala
diff --git a/tests/pending/run/reify_typerefs_1b.check b/tests/disabled/macro/run/reify_typerefs_1b.check
index 919c298ba..919c298ba 100644
--- a/tests/pending/run/reify_typerefs_1b.check
+++ b/tests/disabled/macro/run/reify_typerefs_1b.check
diff --git a/tests/pending/run/reify_typerefs_1b.scala b/tests/disabled/macro/run/reify_typerefs_1b.scala
index 7c4d025f0..7c4d025f0 100644
--- a/tests/pending/run/reify_typerefs_1b.scala
+++ b/tests/disabled/macro/run/reify_typerefs_1b.scala
diff --git a/tests/pending/run/reify_typerefs_2a.check b/tests/disabled/macro/run/reify_typerefs_2a.check
index 919c298ba..919c298ba 100644
--- a/tests/pending/run/reify_typerefs_2a.check
+++ b/tests/disabled/macro/run/reify_typerefs_2a.check
diff --git a/tests/pending/run/reify_typerefs_2a.scala b/tests/disabled/macro/run/reify_typerefs_2a.scala
index a2d5676c0..a2d5676c0 100644
--- a/tests/pending/run/reify_typerefs_2a.scala
+++ b/tests/disabled/macro/run/reify_typerefs_2a.scala
diff --git a/tests/pending/run/reify_typerefs_2b.check b/tests/disabled/macro/run/reify_typerefs_2b.check
index 919c298ba..919c298ba 100644
--- a/tests/pending/run/reify_typerefs_2b.check
+++ b/tests/disabled/macro/run/reify_typerefs_2b.check
diff --git a/tests/pending/run/reify_typerefs_2b.scala b/tests/disabled/macro/run/reify_typerefs_2b.scala
index f5543eaf6..f5543eaf6 100644
--- a/tests/pending/run/reify_typerefs_2b.scala
+++ b/tests/disabled/macro/run/reify_typerefs_2b.scala
diff --git a/tests/pending/run/reify_typerefs_3a.check b/tests/disabled/macro/run/reify_typerefs_3a.check
index 919c298ba..919c298ba 100644
--- a/tests/pending/run/reify_typerefs_3a.check
+++ b/tests/disabled/macro/run/reify_typerefs_3a.check
diff --git a/tests/pending/run/reify_typerefs_3a.scala b/tests/disabled/macro/run/reify_typerefs_3a.scala
index 8d81721f1..8d81721f1 100644
--- a/tests/pending/run/reify_typerefs_3a.scala
+++ b/tests/disabled/macro/run/reify_typerefs_3a.scala
diff --git a/tests/pending/run/reify_typerefs_3b.check b/tests/disabled/macro/run/reify_typerefs_3b.check
index 919c298ba..919c298ba 100644
--- a/tests/pending/run/reify_typerefs_3b.check
+++ b/tests/disabled/macro/run/reify_typerefs_3b.check
diff --git a/tests/pending/run/reify_typerefs_3b.scala b/tests/disabled/macro/run/reify_typerefs_3b.scala
index 212f40fc0..212f40fc0 100644
--- a/tests/pending/run/reify_typerefs_3b.scala
+++ b/tests/disabled/macro/run/reify_typerefs_3b.scala
diff --git a/tests/pending/run/reify_varargs.check b/tests/disabled/macro/run/reify_varargs.check
index e300a570a..e300a570a 100644
--- a/tests/pending/run/reify_varargs.check
+++ b/tests/disabled/macro/run/reify_varargs.check
diff --git a/tests/pending/run/reify_varargs.scala b/tests/disabled/macro/run/reify_varargs.scala
index 36777fe98..36777fe98 100644
--- a/tests/pending/run/reify_varargs.scala
+++ b/tests/disabled/macro/run/reify_varargs.scala
diff --git a/tests/pending/run/repl-term-macros.check b/tests/disabled/macro/run/repl-term-macros.check
index 2cd0b93cd..2cd0b93cd 100644
--- a/tests/pending/run/repl-term-macros.check
+++ b/tests/disabled/macro/run/repl-term-macros.check
diff --git a/tests/pending/run/repl-term-macros.scala b/tests/disabled/macro/run/repl-term-macros.scala
index 32892b731..32892b731 100644
--- a/tests/pending/run/repl-term-macros.scala
+++ b/tests/disabled/macro/run/repl-term-macros.scala
diff --git a/tests/pending/run/runtimeEval1.check b/tests/disabled/macro/run/runtimeEval1.check
index d8263ee98..d8263ee98 100644
--- a/tests/pending/run/runtimeEval1.check
+++ b/tests/disabled/macro/run/runtimeEval1.check
diff --git a/tests/pending/run/runtimeEval1.scala b/tests/disabled/macro/run/runtimeEval1.scala
index 0202dfd06..0202dfd06 100644
--- a/tests/pending/run/runtimeEval1.scala
+++ b/tests/disabled/macro/run/runtimeEval1.scala
diff --git a/tests/pending/run/runtimeEval2.check b/tests/disabled/macro/run/runtimeEval2.check
index 0cfbf0888..0cfbf0888 100644
--- a/tests/pending/run/runtimeEval2.check
+++ b/tests/disabled/macro/run/runtimeEval2.check
diff --git a/tests/pending/run/runtimeEval2.scala b/tests/disabled/macro/run/runtimeEval2.scala
index 2708f9dbc..2708f9dbc 100644
--- a/tests/pending/run/runtimeEval2.scala
+++ b/tests/disabled/macro/run/runtimeEval2.scala
diff --git a/tests/pending/run/showdecl.check b/tests/disabled/macro/run/showdecl.check
index b8d7f94c5..b8d7f94c5 100644
--- a/tests/pending/run/showdecl.check
+++ b/tests/disabled/macro/run/showdecl.check
diff --git a/tests/pending/run/showdecl/Macros_1.scala b/tests/disabled/macro/run/showdecl/Macros_1.scala
index c68dd275d..c68dd275d 100644
--- a/tests/pending/run/showdecl/Macros_1.scala
+++ b/tests/disabled/macro/run/showdecl/Macros_1.scala
diff --git a/tests/pending/run/showdecl/Test_2.scala b/tests/disabled/macro/run/showdecl/Test_2.scala
index fc212ab05..fc212ab05 100644
--- a/tests/pending/run/showdecl/Test_2.scala
+++ b/tests/disabled/macro/run/showdecl/Test_2.scala
diff --git a/tests/pending/run/showraw_mods.check b/tests/disabled/macro/run/showraw_mods.check
index 4d3416042..4d3416042 100644
--- a/tests/pending/run/showraw_mods.check
+++ b/tests/disabled/macro/run/showraw_mods.check
diff --git a/tests/pending/run/showraw_mods.scala b/tests/disabled/macro/run/showraw_mods.scala
index 872685c37..872685c37 100644
--- a/tests/pending/run/showraw_mods.scala
+++ b/tests/disabled/macro/run/showraw_mods.scala
diff --git a/tests/pending/run/showraw_tree.check b/tests/disabled/macro/run/showraw_tree.check
index d8cb1fde0..d8cb1fde0 100644
--- a/tests/pending/run/showraw_tree.check
+++ b/tests/disabled/macro/run/showraw_tree.check
diff --git a/tests/pending/run/showraw_tree.scala b/tests/disabled/macro/run/showraw_tree.scala
index fbd4c1dfa..fbd4c1dfa 100644
--- a/tests/pending/run/showraw_tree.scala
+++ b/tests/disabled/macro/run/showraw_tree.scala
diff --git a/tests/pending/run/showraw_tree_ids.check b/tests/disabled/macro/run/showraw_tree_ids.check
index d7a7aa595..d7a7aa595 100644
--- a/tests/pending/run/showraw_tree_ids.check
+++ b/tests/disabled/macro/run/showraw_tree_ids.check
diff --git a/tests/pending/run/showraw_tree_ids.scala b/tests/disabled/macro/run/showraw_tree_ids.scala
index 739ea55b5..739ea55b5 100644
--- a/tests/pending/run/showraw_tree_ids.scala
+++ b/tests/disabled/macro/run/showraw_tree_ids.scala
diff --git a/tests/pending/run/showraw_tree_kinds.check b/tests/disabled/macro/run/showraw_tree_kinds.check
index 85939b02f..85939b02f 100644
--- a/tests/pending/run/showraw_tree_kinds.check
+++ b/tests/disabled/macro/run/showraw_tree_kinds.check
diff --git a/tests/pending/run/showraw_tree_kinds.scala b/tests/disabled/macro/run/showraw_tree_kinds.scala
index 0891015ac..0891015ac 100644
--- a/tests/pending/run/showraw_tree_kinds.scala
+++ b/tests/disabled/macro/run/showraw_tree_kinds.scala
diff --git a/tests/pending/run/showraw_tree_types_ids.check b/tests/disabled/macro/run/showraw_tree_types_ids.check
index 75347463c..75347463c 100644
--- a/tests/pending/run/showraw_tree_types_ids.check
+++ b/tests/disabled/macro/run/showraw_tree_types_ids.check
diff --git a/tests/pending/run/showraw_tree_types_ids.scala b/tests/disabled/macro/run/showraw_tree_types_ids.scala
index 30f51c549..30f51c549 100644
--- a/tests/pending/run/showraw_tree_types_ids.scala
+++ b/tests/disabled/macro/run/showraw_tree_types_ids.scala
diff --git a/tests/pending/run/showraw_tree_types_typed.check b/tests/disabled/macro/run/showraw_tree_types_typed.check
index de691e369..de691e369 100644
--- a/tests/pending/run/showraw_tree_types_typed.check
+++ b/tests/disabled/macro/run/showraw_tree_types_typed.check
diff --git a/tests/pending/run/showraw_tree_types_typed.scala b/tests/disabled/macro/run/showraw_tree_types_typed.scala
index e24eac9f8..e24eac9f8 100644
--- a/tests/pending/run/showraw_tree_types_typed.scala
+++ b/tests/disabled/macro/run/showraw_tree_types_typed.scala
diff --git a/tests/pending/run/showraw_tree_types_untyped.check b/tests/disabled/macro/run/showraw_tree_types_untyped.check
index d8cb1fde0..d8cb1fde0 100644
--- a/tests/pending/run/showraw_tree_types_untyped.check
+++ b/tests/disabled/macro/run/showraw_tree_types_untyped.check
diff --git a/tests/pending/run/showraw_tree_types_untyped.scala b/tests/disabled/macro/run/showraw_tree_types_untyped.scala
index 87dfd7242..87dfd7242 100644
--- a/tests/pending/run/showraw_tree_types_untyped.scala
+++ b/tests/disabled/macro/run/showraw_tree_types_untyped.scala
diff --git a/tests/pending/run/showraw_tree_ultimate.check b/tests/disabled/macro/run/showraw_tree_ultimate.check
index 81efcc05a..81efcc05a 100644
--- a/tests/pending/run/showraw_tree_ultimate.check
+++ b/tests/disabled/macro/run/showraw_tree_ultimate.check
diff --git a/tests/pending/run/showraw_tree_ultimate.scala b/tests/disabled/macro/run/showraw_tree_ultimate.scala
index 0a97622ad..0a97622ad 100644
--- a/tests/pending/run/showraw_tree_ultimate.scala
+++ b/tests/disabled/macro/run/showraw_tree_ultimate.scala
diff --git a/tests/pending/run/t2886.check b/tests/disabled/macro/run/t2886.check
index 61e36948b..61e36948b 100644
--- a/tests/pending/run/t2886.check
+++ b/tests/disabled/macro/run/t2886.check
diff --git a/tests/pending/run/t2886.scala b/tests/disabled/macro/run/t2886.scala
index 44783a5d8..44783a5d8 100644
--- a/tests/pending/run/t2886.scala
+++ b/tests/disabled/macro/run/t2886.scala
diff --git a/tests/pending/run/t5224.check b/tests/disabled/macro/run/t5224.check
index b11480acd..b11480acd 100644
--- a/tests/pending/run/t5224.check
+++ b/tests/disabled/macro/run/t5224.check
diff --git a/tests/pending/run/t5224.scala b/tests/disabled/macro/run/t5224.scala
index d0cd9a455..d0cd9a455 100644
--- a/tests/pending/run/t5224.scala
+++ b/tests/disabled/macro/run/t5224.scala
diff --git a/tests/pending/run/t5225_1.check b/tests/disabled/macro/run/t5225_1.check
index 1a47aacfd..1a47aacfd 100644
--- a/tests/pending/run/t5225_1.check
+++ b/tests/disabled/macro/run/t5225_1.check
diff --git a/tests/pending/run/t5225_1.scala b/tests/disabled/macro/run/t5225_1.scala
index a553e83ce..a553e83ce 100644
--- a/tests/pending/run/t5225_1.scala
+++ b/tests/disabled/macro/run/t5225_1.scala
diff --git a/tests/pending/run/t5225_2.check b/tests/disabled/macro/run/t5225_2.check
index 477ea4eb6..477ea4eb6 100644
--- a/tests/pending/run/t5225_2.check
+++ b/tests/disabled/macro/run/t5225_2.check
diff --git a/tests/pending/run/t5225_2.scala b/tests/disabled/macro/run/t5225_2.scala
index 54e7fec1f..54e7fec1f 100644
--- a/tests/pending/run/t5225_2.scala
+++ b/tests/disabled/macro/run/t5225_2.scala
diff --git a/tests/pending/run/t5229_1.scala b/tests/disabled/macro/run/t5229_1.scala
index 62341fdbb..62341fdbb 100644
--- a/tests/pending/run/t5229_1.scala
+++ b/tests/disabled/macro/run/t5229_1.scala
diff --git a/tests/pending/run/t5229_2.check b/tests/disabled/macro/run/t5229_2.check
index 43c25b96a..43c25b96a 100644
--- a/tests/pending/run/t5229_2.check
+++ b/tests/disabled/macro/run/t5229_2.check
diff --git a/tests/pending/run/t5229_2.scala b/tests/disabled/macro/run/t5229_2.scala
index a9cd08947..a9cd08947 100644
--- a/tests/pending/run/t5229_2.scala
+++ b/tests/disabled/macro/run/t5229_2.scala
diff --git a/tests/pending/run/t5230.check b/tests/disabled/macro/run/t5230.check
index 43c25b96a..43c25b96a 100644
--- a/tests/pending/run/t5230.check
+++ b/tests/disabled/macro/run/t5230.check
diff --git a/tests/pending/run/t5230.scala b/tests/disabled/macro/run/t5230.scala
index 5c934c345..5c934c345 100644
--- a/tests/pending/run/t5230.scala
+++ b/tests/disabled/macro/run/t5230.scala
diff --git a/tests/pending/run/t5258a.check b/tests/disabled/macro/run/t5258a.check
index 4e0b2da04..4e0b2da04 100644
--- a/tests/pending/run/t5258a.check
+++ b/tests/disabled/macro/run/t5258a.check
diff --git a/tests/pending/run/t5258a.scala b/tests/disabled/macro/run/t5258a.scala
index 5a22a251c..5a22a251c 100644
--- a/tests/pending/run/t5258a.scala
+++ b/tests/disabled/macro/run/t5258a.scala
diff --git a/tests/pending/run/t5266_1.check b/tests/disabled/macro/run/t5266_1.check
index 35f20802e..35f20802e 100644
--- a/tests/pending/run/t5266_1.check
+++ b/tests/disabled/macro/run/t5266_1.check
diff --git a/tests/pending/run/t5266_1.scala b/tests/disabled/macro/run/t5266_1.scala
index 5ed943ee6..5ed943ee6 100644
--- a/tests/pending/run/t5266_1.scala
+++ b/tests/disabled/macro/run/t5266_1.scala
diff --git a/tests/pending/run/t5266_2.check b/tests/disabled/macro/run/t5266_2.check
index 35f20802e..35f20802e 100644
--- a/tests/pending/run/t5266_2.check
+++ b/tests/disabled/macro/run/t5266_2.check
diff --git a/tests/pending/run/t5266_2.scala b/tests/disabled/macro/run/t5266_2.scala
index c8c3ab824..c8c3ab824 100644
--- a/tests/pending/run/t5266_2.scala
+++ b/tests/disabled/macro/run/t5266_2.scala
diff --git a/tests/pending/run/t5269.check b/tests/disabled/macro/run/t5269.check
index 0cfbf0888..0cfbf0888 100644
--- a/tests/pending/run/t5269.check
+++ b/tests/disabled/macro/run/t5269.check
diff --git a/tests/pending/run/t5269.scala b/tests/disabled/macro/run/t5269.scala
index dbaa1d1d8..dbaa1d1d8 100644
--- a/tests/pending/run/t5269.scala
+++ b/tests/disabled/macro/run/t5269.scala
diff --git a/tests/pending/run/t5270.check b/tests/disabled/macro/run/t5270.check
index 08839f6bb..08839f6bb 100644
--- a/tests/pending/run/t5270.check
+++ b/tests/disabled/macro/run/t5270.check
diff --git a/tests/pending/run/t5270.scala b/tests/disabled/macro/run/t5270.scala
index 03ba765fd..03ba765fd 100644
--- a/tests/pending/run/t5270.scala
+++ b/tests/disabled/macro/run/t5270.scala
diff --git a/tests/pending/run/t5271_1.check b/tests/disabled/macro/run/t5271_1.check
index 544b4d276..544b4d276 100644
--- a/tests/pending/run/t5271_1.check
+++ b/tests/disabled/macro/run/t5271_1.check
diff --git a/tests/pending/run/t5271_1.scala b/tests/disabled/macro/run/t5271_1.scala
index cdae3df58..cdae3df58 100644
--- a/tests/pending/run/t5271_1.scala
+++ b/tests/disabled/macro/run/t5271_1.scala
diff --git a/tests/pending/run/t5271_2.check b/tests/disabled/macro/run/t5271_2.check
index 1df88872a..1df88872a 100644
--- a/tests/pending/run/t5271_2.check
+++ b/tests/disabled/macro/run/t5271_2.check
diff --git a/tests/pending/run/t5271_2.scala b/tests/disabled/macro/run/t5271_2.scala
index 654fa7b30..654fa7b30 100644
--- a/tests/pending/run/t5271_2.scala
+++ b/tests/disabled/macro/run/t5271_2.scala
diff --git a/tests/pending/run/t5271_3.check b/tests/disabled/macro/run/t5271_3.check
index 99aacc2ce..99aacc2ce 100644
--- a/tests/pending/run/t5271_3.check
+++ b/tests/disabled/macro/run/t5271_3.check
diff --git a/tests/pending/run/t5271_3.scala b/tests/disabled/macro/run/t5271_3.scala
index 2fa4cea77..2fa4cea77 100644
--- a/tests/pending/run/t5271_3.scala
+++ b/tests/disabled/macro/run/t5271_3.scala
diff --git a/tests/pending/run/t5271_4.scala b/tests/disabled/macro/run/t5271_4.scala
index 03cca7c48..03cca7c48 100644
--- a/tests/pending/run/t5271_4.scala
+++ b/tests/disabled/macro/run/t5271_4.scala
diff --git a/tests/pending/run/t5272_1_newpatmat.check b/tests/disabled/macro/run/t5272_1_newpatmat.check
index 9f8d6f24e..9f8d6f24e 100644
--- a/tests/pending/run/t5272_1_newpatmat.check
+++ b/tests/disabled/macro/run/t5272_1_newpatmat.check
diff --git a/tests/pending/run/t5272_1_newpatmat.scala b/tests/disabled/macro/run/t5272_1_newpatmat.scala
index 30d0c875d..30d0c875d 100644
--- a/tests/pending/run/t5272_1_newpatmat.scala
+++ b/tests/disabled/macro/run/t5272_1_newpatmat.scala
diff --git a/tests/pending/run/t5272_1_oldpatmat.check b/tests/disabled/macro/run/t5272_1_oldpatmat.check
index 9f8d6f24e..9f8d6f24e 100644
--- a/tests/pending/run/t5272_1_oldpatmat.check
+++ b/tests/disabled/macro/run/t5272_1_oldpatmat.check
diff --git a/tests/pending/run/t5272_1_oldpatmat.scala b/tests/disabled/macro/run/t5272_1_oldpatmat.scala
index 30d0c875d..30d0c875d 100644
--- a/tests/pending/run/t5272_1_oldpatmat.scala
+++ b/tests/disabled/macro/run/t5272_1_oldpatmat.scala
diff --git a/tests/pending/run/t5272_2_newpatmat.check b/tests/disabled/macro/run/t5272_2_newpatmat.check
index 549f3f3af..549f3f3af 100644
--- a/tests/pending/run/t5272_2_newpatmat.check
+++ b/tests/disabled/macro/run/t5272_2_newpatmat.check
diff --git a/tests/pending/run/t5272_2_newpatmat.scala b/tests/disabled/macro/run/t5272_2_newpatmat.scala
index 436f0fd4f..436f0fd4f 100644
--- a/tests/pending/run/t5272_2_newpatmat.scala
+++ b/tests/disabled/macro/run/t5272_2_newpatmat.scala
diff --git a/tests/pending/run/t5272_2_oldpatmat.check b/tests/disabled/macro/run/t5272_2_oldpatmat.check
index 549f3f3af..549f3f3af 100644
--- a/tests/pending/run/t5272_2_oldpatmat.check
+++ b/tests/disabled/macro/run/t5272_2_oldpatmat.check
diff --git a/tests/pending/run/t5272_2_oldpatmat.scala b/tests/disabled/macro/run/t5272_2_oldpatmat.scala
index 436f0fd4f..436f0fd4f 100644
--- a/tests/pending/run/t5272_2_oldpatmat.scala
+++ b/tests/disabled/macro/run/t5272_2_oldpatmat.scala
diff --git a/tests/pending/run/t5273_1_newpatmat.check b/tests/disabled/macro/run/t5273_1_newpatmat.check
index 0cfbf0888..0cfbf0888 100644
--- a/tests/pending/run/t5273_1_newpatmat.check
+++ b/tests/disabled/macro/run/t5273_1_newpatmat.check
diff --git a/tests/pending/run/t5273_1_newpatmat.scala b/tests/disabled/macro/run/t5273_1_newpatmat.scala
index 1ed2ce79a..1ed2ce79a 100644
--- a/tests/pending/run/t5273_1_newpatmat.scala
+++ b/tests/disabled/macro/run/t5273_1_newpatmat.scala
diff --git a/tests/pending/run/t5273_1_oldpatmat.check b/tests/disabled/macro/run/t5273_1_oldpatmat.check
index 0cfbf0888..0cfbf0888 100644
--- a/tests/pending/run/t5273_1_oldpatmat.check
+++ b/tests/disabled/macro/run/t5273_1_oldpatmat.check
diff --git a/tests/pending/run/t5273_1_oldpatmat.scala b/tests/disabled/macro/run/t5273_1_oldpatmat.scala
index 1ed2ce79a..1ed2ce79a 100644
--- a/tests/pending/run/t5273_1_oldpatmat.scala
+++ b/tests/disabled/macro/run/t5273_1_oldpatmat.scala
diff --git a/tests/pending/run/t5273_2a_newpatmat.check b/tests/disabled/macro/run/t5273_2a_newpatmat.check
index d8263ee98..d8263ee98 100644
--- a/tests/pending/run/t5273_2a_newpatmat.check
+++ b/tests/disabled/macro/run/t5273_2a_newpatmat.check
diff --git a/tests/pending/run/t5273_2a_newpatmat.scala b/tests/disabled/macro/run/t5273_2a_newpatmat.scala
index cb4c15146..cb4c15146 100644
--- a/tests/pending/run/t5273_2a_newpatmat.scala
+++ b/tests/disabled/macro/run/t5273_2a_newpatmat.scala
diff --git a/tests/pending/run/t5273_2a_oldpatmat.check b/tests/disabled/macro/run/t5273_2a_oldpatmat.check
index d8263ee98..d8263ee98 100644
--- a/tests/pending/run/t5273_2a_oldpatmat.check
+++ b/tests/disabled/macro/run/t5273_2a_oldpatmat.check
diff --git a/tests/pending/run/t5273_2a_oldpatmat.scala b/tests/disabled/macro/run/t5273_2a_oldpatmat.scala
index cb4c15146..cb4c15146 100644
--- a/tests/pending/run/t5273_2a_oldpatmat.scala
+++ b/tests/disabled/macro/run/t5273_2a_oldpatmat.scala
diff --git a/tests/pending/run/t5273_2b_newpatmat.check b/tests/disabled/macro/run/t5273_2b_newpatmat.check
index c551774ca..c551774ca 100644
--- a/tests/pending/run/t5273_2b_newpatmat.check
+++ b/tests/disabled/macro/run/t5273_2b_newpatmat.check
diff --git a/tests/pending/run/t5273_2b_newpatmat.scala b/tests/disabled/macro/run/t5273_2b_newpatmat.scala
index ca4a31566..ca4a31566 100644
--- a/tests/pending/run/t5273_2b_newpatmat.scala
+++ b/tests/disabled/macro/run/t5273_2b_newpatmat.scala
diff --git a/tests/pending/run/t5273_2b_oldpatmat.check b/tests/disabled/macro/run/t5273_2b_oldpatmat.check
index c551774ca..c551774ca 100644
--- a/tests/pending/run/t5273_2b_oldpatmat.check
+++ b/tests/disabled/macro/run/t5273_2b_oldpatmat.check
diff --git a/tests/pending/run/t5273_2b_oldpatmat.scala b/tests/disabled/macro/run/t5273_2b_oldpatmat.scala
index ca4a31566..ca4a31566 100644
--- a/tests/pending/run/t5273_2b_oldpatmat.scala
+++ b/tests/disabled/macro/run/t5273_2b_oldpatmat.scala
diff --git a/tests/pending/run/t5274_1.check b/tests/disabled/macro/run/t5274_1.check
index fca8bc3d3..fca8bc3d3 100644
--- a/tests/pending/run/t5274_1.check
+++ b/tests/disabled/macro/run/t5274_1.check
diff --git a/tests/pending/run/t5274_1.scala b/tests/disabled/macro/run/t5274_1.scala
index bc0ba99e4..bc0ba99e4 100644
--- a/tests/pending/run/t5274_1.scala
+++ b/tests/disabled/macro/run/t5274_1.scala
diff --git a/tests/pending/run/t5274_2.check b/tests/disabled/macro/run/t5274_2.check
index 375536cc2..375536cc2 100644
--- a/tests/pending/run/t5274_2.check
+++ b/tests/disabled/macro/run/t5274_2.check
diff --git a/tests/pending/run/t5274_2.scala b/tests/disabled/macro/run/t5274_2.scala
index b484111ed..b484111ed 100644
--- a/tests/pending/run/t5274_2.scala
+++ b/tests/disabled/macro/run/t5274_2.scala
diff --git a/tests/pending/run/t5275.check b/tests/disabled/macro/run/t5275.check
index 0cfbf0888..0cfbf0888 100644
--- a/tests/pending/run/t5275.check
+++ b/tests/disabled/macro/run/t5275.check
diff --git a/tests/pending/run/t5275.scala b/tests/disabled/macro/run/t5275.scala
index 38b77abab..38b77abab 100644
--- a/tests/pending/run/t5275.scala
+++ b/tests/disabled/macro/run/t5275.scala
diff --git a/tests/pending/run/t5276_1a.check b/tests/disabled/macro/run/t5276_1a.check
index d8263ee98..d8263ee98 100644
--- a/tests/pending/run/t5276_1a.check
+++ b/tests/disabled/macro/run/t5276_1a.check
diff --git a/tests/pending/run/t5276_1a.scala b/tests/disabled/macro/run/t5276_1a.scala
index ad76b2e69..ad76b2e69 100644
--- a/tests/pending/run/t5276_1a.scala
+++ b/tests/disabled/macro/run/t5276_1a.scala
diff --git a/tests/pending/run/t5276_1b.check b/tests/disabled/macro/run/t5276_1b.check
index d8263ee98..d8263ee98 100644
--- a/tests/pending/run/t5276_1b.check
+++ b/tests/disabled/macro/run/t5276_1b.check
diff --git a/tests/pending/run/t5276_1b.scala b/tests/disabled/macro/run/t5276_1b.scala
index 8f11bdc6e..8f11bdc6e 100644
--- a/tests/pending/run/t5276_1b.scala
+++ b/tests/disabled/macro/run/t5276_1b.scala
diff --git a/tests/pending/run/t5276_2a.check b/tests/disabled/macro/run/t5276_2a.check
index d8263ee98..d8263ee98 100644
--- a/tests/pending/run/t5276_2a.check
+++ b/tests/disabled/macro/run/t5276_2a.check
diff --git a/tests/pending/run/t5276_2a.scala b/tests/disabled/macro/run/t5276_2a.scala
index 7086fc983..7086fc983 100644
--- a/tests/pending/run/t5276_2a.scala
+++ b/tests/disabled/macro/run/t5276_2a.scala
diff --git a/tests/pending/run/t5276_2b.check b/tests/disabled/macro/run/t5276_2b.check
index d8263ee98..d8263ee98 100644
--- a/tests/pending/run/t5276_2b.check
+++ b/tests/disabled/macro/run/t5276_2b.check
diff --git a/tests/pending/run/t5276_2b.scala b/tests/disabled/macro/run/t5276_2b.scala
index cccc76a2d..cccc76a2d 100644
--- a/tests/pending/run/t5276_2b.scala
+++ b/tests/disabled/macro/run/t5276_2b.scala
diff --git a/tests/pending/run/t5277_1.check b/tests/disabled/macro/run/t5277_1.check
index a48033a30..a48033a30 100644
--- a/tests/pending/run/t5277_1.check
+++ b/tests/disabled/macro/run/t5277_1.check
diff --git a/tests/pending/run/t5277_1.scala b/tests/disabled/macro/run/t5277_1.scala
index 580098666..580098666 100644
--- a/tests/pending/run/t5277_1.scala
+++ b/tests/disabled/macro/run/t5277_1.scala
diff --git a/tests/pending/run/t5277_2.check b/tests/disabled/macro/run/t5277_2.check
index ca017e2a4..ca017e2a4 100644
--- a/tests/pending/run/t5277_2.check
+++ b/tests/disabled/macro/run/t5277_2.check
diff --git a/tests/pending/run/t5277_2.scala b/tests/disabled/macro/run/t5277_2.scala
index 33e31da27..33e31da27 100644
--- a/tests/pending/run/t5277_2.scala
+++ b/tests/disabled/macro/run/t5277_2.scala
diff --git a/tests/pending/run/t5279.check b/tests/disabled/macro/run/t5279.check
index f599e28b8..f599e28b8 100644
--- a/tests/pending/run/t5279.check
+++ b/tests/disabled/macro/run/t5279.check
diff --git a/tests/pending/run/t5279.scala b/tests/disabled/macro/run/t5279.scala
index ed1510204..ed1510204 100644
--- a/tests/pending/run/t5279.scala
+++ b/tests/disabled/macro/run/t5279.scala
diff --git a/tests/pending/run/t5334_1.check b/tests/disabled/macro/run/t5334_1.check
index 96d80cd6c..96d80cd6c 100644
--- a/tests/pending/run/t5334_1.check
+++ b/tests/disabled/macro/run/t5334_1.check
diff --git a/tests/pending/run/t5334_1.scala b/tests/disabled/macro/run/t5334_1.scala
index 58954c2f9..58954c2f9 100644
--- a/tests/pending/run/t5334_1.scala
+++ b/tests/disabled/macro/run/t5334_1.scala
diff --git a/tests/pending/run/t5334_2.check b/tests/disabled/macro/run/t5334_2.check
index 613d286a1..613d286a1 100644
--- a/tests/pending/run/t5334_2.check
+++ b/tests/disabled/macro/run/t5334_2.check
diff --git a/tests/pending/run/t5334_2.scala b/tests/disabled/macro/run/t5334_2.scala
index 105819405..105819405 100644
--- a/tests/pending/run/t5334_2.scala
+++ b/tests/disabled/macro/run/t5334_2.scala
diff --git a/tests/pending/run/t5335.check b/tests/disabled/macro/run/t5335.check
index 0cfbf0888..0cfbf0888 100644
--- a/tests/pending/run/t5335.check
+++ b/tests/disabled/macro/run/t5335.check
diff --git a/tests/pending/run/t5335.scala b/tests/disabled/macro/run/t5335.scala
index c85c5730e..c85c5730e 100644
--- a/tests/pending/run/t5335.scala
+++ b/tests/disabled/macro/run/t5335.scala
diff --git a/tests/pending/run/t5415.scala b/tests/disabled/macro/run/t5415.scala
index cdc90b8ae..cdc90b8ae 100644
--- a/tests/pending/run/t5415.scala
+++ b/tests/disabled/macro/run/t5415.scala
diff --git a/tests/pending/run/t5418.scala b/tests/disabled/macro/run/t5418.scala
index beec4370d..beec4370d 100644
--- a/tests/pending/run/t5418.scala
+++ b/tests/disabled/macro/run/t5418.scala
diff --git a/tests/pending/run/t5418a.check b/tests/disabled/macro/run/t5418a.check
index 527022936..527022936 100644
--- a/tests/pending/run/t5418a.check
+++ b/tests/disabled/macro/run/t5418a.check
diff --git a/tests/pending/run/t5418a.scala b/tests/disabled/macro/run/t5418a.scala
index 722348685..722348685 100644
--- a/tests/pending/run/t5418a.scala
+++ b/tests/disabled/macro/run/t5418a.scala
diff --git a/tests/pending/run/t5418b.check b/tests/disabled/macro/run/t5418b.check
index f036a4be8..f036a4be8 100644
--- a/tests/pending/run/t5418b.check
+++ b/tests/disabled/macro/run/t5418b.check
diff --git a/tests/pending/run/t5418b.scala b/tests/disabled/macro/run/t5418b.scala
index 650700ae2..650700ae2 100644
--- a/tests/pending/run/t5418b.scala
+++ b/tests/disabled/macro/run/t5418b.scala
diff --git a/tests/pending/run/t5419.check b/tests/disabled/macro/run/t5419.check
index a9c0f262e..a9c0f262e 100644
--- a/tests/pending/run/t5419.check
+++ b/tests/disabled/macro/run/t5419.check
diff --git a/tests/pending/run/t5419.scala b/tests/disabled/macro/run/t5419.scala
index e0ee02a5c..e0ee02a5c 100644
--- a/tests/pending/run/t5419.scala
+++ b/tests/disabled/macro/run/t5419.scala
diff --git a/tests/pending/run/t5704.check b/tests/disabled/macro/run/t5704.check
index 102e3209c..102e3209c 100644
--- a/tests/pending/run/t5704.check
+++ b/tests/disabled/macro/run/t5704.check
diff --git a/tests/pending/run/t5704.flags b/tests/disabled/macro/run/t5704.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/t5704.flags
+++ b/tests/disabled/macro/run/t5704.flags
diff --git a/tests/pending/run/t5704.scala b/tests/disabled/macro/run/t5704.scala
index b9765ebb6..b9765ebb6 100644
--- a/tests/pending/run/t5704.scala
+++ b/tests/disabled/macro/run/t5704.scala
diff --git a/tests/pending/run/t5710-1.check b/tests/disabled/macro/run/t5710-1.check
index eac2025ae..eac2025ae 100644
--- a/tests/pending/run/t5710-1.check
+++ b/tests/disabled/macro/run/t5710-1.check
diff --git a/tests/pending/run/t5710-1.scala b/tests/disabled/macro/run/t5710-1.scala
index 5548ca4ca..5548ca4ca 100644
--- a/tests/pending/run/t5710-1.scala
+++ b/tests/disabled/macro/run/t5710-1.scala
diff --git a/tests/pending/run/t5710-2.check b/tests/disabled/macro/run/t5710-2.check
index eac2025ae..eac2025ae 100644
--- a/tests/pending/run/t5710-2.check
+++ b/tests/disabled/macro/run/t5710-2.check
diff --git a/tests/pending/run/t5710-2.scala b/tests/disabled/macro/run/t5710-2.scala
index c5129ce34..c5129ce34 100644
--- a/tests/pending/run/t5710-2.scala
+++ b/tests/disabled/macro/run/t5710-2.scala
diff --git a/tests/pending/run/t5713.check b/tests/disabled/macro/run/t5713.check
index 1419eb9d7..1419eb9d7 100644
--- a/tests/pending/run/t5713.check
+++ b/tests/disabled/macro/run/t5713.check
diff --git a/tests/pending/run/t5713.flags b/tests/disabled/macro/run/t5713.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/t5713.flags
+++ b/tests/disabled/macro/run/t5713.flags
diff --git a/tests/pending/run/t5713/Impls_Macros_1.scala b/tests/disabled/macro/run/t5713/Impls_Macros_1.scala
index 7b04197cf..7b04197cf 100644
--- a/tests/pending/run/t5713/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/t5713/Impls_Macros_1.scala
diff --git a/tests/pending/run/t5713/Test_2.scala b/tests/disabled/macro/run/t5713/Test_2.scala
index 7e4d02a80..7e4d02a80 100644
--- a/tests/pending/run/t5713/Test_2.scala
+++ b/tests/disabled/macro/run/t5713/Test_2.scala
diff --git a/tests/pending/run/t5753_1.check b/tests/disabled/macro/run/t5753_1.check
index f70d7bba4..f70d7bba4 100644
--- a/tests/pending/run/t5753_1.check
+++ b/tests/disabled/macro/run/t5753_1.check
diff --git a/tests/pending/run/t5753_1.flags b/tests/disabled/macro/run/t5753_1.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/t5753_1.flags
+++ b/tests/disabled/macro/run/t5753_1.flags
diff --git a/tests/pending/run/t5753_1/Impls_Macros_1.scala b/tests/disabled/macro/run/t5753_1/Impls_Macros_1.scala
index ce0713885..ce0713885 100644
--- a/tests/pending/run/t5753_1/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/t5753_1/Impls_Macros_1.scala
diff --git a/tests/pending/run/t5753_1/Test_2.scala b/tests/disabled/macro/run/t5753_1/Test_2.scala
index 413eefff3..413eefff3 100644
--- a/tests/pending/run/t5753_1/Test_2.scala
+++ b/tests/disabled/macro/run/t5753_1/Test_2.scala
diff --git a/tests/pending/run/t5753_2.check b/tests/disabled/macro/run/t5753_2.check
index f70d7bba4..f70d7bba4 100644
--- a/tests/pending/run/t5753_2.check
+++ b/tests/disabled/macro/run/t5753_2.check
diff --git a/tests/pending/run/t5753_2.flags b/tests/disabled/macro/run/t5753_2.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/t5753_2.flags
+++ b/tests/disabled/macro/run/t5753_2.flags
diff --git a/tests/pending/run/t5753_2/Impls_Macros_1.scala b/tests/disabled/macro/run/t5753_2/Impls_Macros_1.scala
index d446d37bd..d446d37bd 100644
--- a/tests/pending/run/t5753_2/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/t5753_2/Impls_Macros_1.scala
diff --git a/tests/pending/run/t5753_2/Test_2.scala b/tests/disabled/macro/run/t5753_2/Test_2.scala
index 413eefff3..413eefff3 100644
--- a/tests/pending/run/t5753_2/Test_2.scala
+++ b/tests/disabled/macro/run/t5753_2/Test_2.scala
diff --git a/tests/pending/run/t5770.check b/tests/disabled/macro/run/t5770.check
index f00c965d8..f00c965d8 100644
--- a/tests/pending/run/t5770.check
+++ b/tests/disabled/macro/run/t5770.check
diff --git a/tests/pending/run/t5770.scala b/tests/disabled/macro/run/t5770.scala
index 409efb2d1..409efb2d1 100644
--- a/tests/pending/run/t5770.scala
+++ b/tests/disabled/macro/run/t5770.scala
diff --git a/tests/pending/run/t5816.check b/tests/disabled/macro/run/t5816.check
index 8e58ace9b..8e58ace9b 100644
--- a/tests/pending/run/t5816.check
+++ b/tests/disabled/macro/run/t5816.check
diff --git a/tests/pending/run/t5816.scala b/tests/disabled/macro/run/t5816.scala
index 4c2a5bcb7..4c2a5bcb7 100644
--- a/tests/pending/run/t5816.scala
+++ b/tests/disabled/macro/run/t5816.scala
diff --git a/tests/pending/run/t5824.check b/tests/disabled/macro/run/t5824.check
index 3774da60e..3774da60e 100644
--- a/tests/pending/run/t5824.check
+++ b/tests/disabled/macro/run/t5824.check
diff --git a/tests/pending/run/t5824.scala b/tests/disabled/macro/run/t5824.scala
index c5cfc280f..c5cfc280f 100644
--- a/tests/pending/run/t5824.scala
+++ b/tests/disabled/macro/run/t5824.scala
diff --git a/tests/pending/run/t5840.scala b/tests/disabled/macro/run/t5840.scala
index ba2376f0f..ba2376f0f 100644
--- a/tests/pending/run/t5840.scala
+++ b/tests/disabled/macro/run/t5840.scala
diff --git a/tests/pending/run/t5894.scala b/tests/disabled/macro/run/t5894.scala
index c67a46def..c67a46def 100644
--- a/tests/pending/run/t5894.scala
+++ b/tests/disabled/macro/run/t5894.scala
diff --git a/tests/pending/run/t5903a.check b/tests/disabled/macro/run/t5903a.check
index ce6efd812..ce6efd812 100644
--- a/tests/pending/run/t5903a.check
+++ b/tests/disabled/macro/run/t5903a.check
diff --git a/tests/pending/run/t5903a.flags b/tests/disabled/macro/run/t5903a.flags
index 02ecab49e..02ecab49e 100644
--- a/tests/pending/run/t5903a.flags
+++ b/tests/disabled/macro/run/t5903a.flags
diff --git a/tests/pending/run/t5903a/Macros_1.scala b/tests/disabled/macro/run/t5903a/Macros_1.scala
index 5d084ceed..5d084ceed 100644
--- a/tests/pending/run/t5903a/Macros_1.scala
+++ b/tests/disabled/macro/run/t5903a/Macros_1.scala
diff --git a/tests/pending/run/t5903a/Test_2.scala b/tests/disabled/macro/run/t5903a/Test_2.scala
index 55a8320b3..55a8320b3 100644
--- a/tests/pending/run/t5903a/Test_2.scala
+++ b/tests/disabled/macro/run/t5903a/Test_2.scala
diff --git a/tests/pending/run/t5903b.check b/tests/disabled/macro/run/t5903b.check
index 75891bc67..75891bc67 100644
--- a/tests/pending/run/t5903b.check
+++ b/tests/disabled/macro/run/t5903b.check
diff --git a/tests/pending/run/t5903b.flags b/tests/disabled/macro/run/t5903b.flags
index 02ecab49e..02ecab49e 100644
--- a/tests/pending/run/t5903b.flags
+++ b/tests/disabled/macro/run/t5903b.flags
diff --git a/tests/pending/run/t5903b/Macros_1.scala b/tests/disabled/macro/run/t5903b/Macros_1.scala
index 29a05f7fe..29a05f7fe 100644
--- a/tests/pending/run/t5903b/Macros_1.scala
+++ b/tests/disabled/macro/run/t5903b/Macros_1.scala
diff --git a/tests/pending/run/t5903b/Test_2.scala b/tests/disabled/macro/run/t5903b/Test_2.scala
index 23a92225d..23a92225d 100644
--- a/tests/pending/run/t5903b/Test_2.scala
+++ b/tests/disabled/macro/run/t5903b/Test_2.scala
diff --git a/tests/pending/run/t5903c.check b/tests/disabled/macro/run/t5903c.check
index 0cfbf0888..0cfbf0888 100644
--- a/tests/pending/run/t5903c.check
+++ b/tests/disabled/macro/run/t5903c.check
diff --git a/tests/pending/run/t5903c.flags b/tests/disabled/macro/run/t5903c.flags
index 02ecab49e..02ecab49e 100644
--- a/tests/pending/run/t5903c.flags
+++ b/tests/disabled/macro/run/t5903c.flags
diff --git a/tests/pending/run/t5903c/Macros_1.scala b/tests/disabled/macro/run/t5903c/Macros_1.scala
index 34fe1d880..34fe1d880 100644
--- a/tests/pending/run/t5903c/Macros_1.scala
+++ b/tests/disabled/macro/run/t5903c/Macros_1.scala
diff --git a/tests/pending/run/t5903c/Test_2.scala b/tests/disabled/macro/run/t5903c/Test_2.scala
index 23a92225d..23a92225d 100644
--- a/tests/pending/run/t5903c/Test_2.scala
+++ b/tests/disabled/macro/run/t5903c/Test_2.scala
diff --git a/tests/pending/run/t5903d.check b/tests/disabled/macro/run/t5903d.check
index d81cc0710..d81cc0710 100644
--- a/tests/pending/run/t5903d.check
+++ b/tests/disabled/macro/run/t5903d.check
diff --git a/tests/pending/run/t5903d.flags b/tests/disabled/macro/run/t5903d.flags
index 02ecab49e..02ecab49e 100644
--- a/tests/pending/run/t5903d.flags
+++ b/tests/disabled/macro/run/t5903d.flags
diff --git a/tests/pending/run/t5903d/Macros_1.scala b/tests/disabled/macro/run/t5903d/Macros_1.scala
index f1f8dc1fd..f1f8dc1fd 100644
--- a/tests/pending/run/t5903d/Macros_1.scala
+++ b/tests/disabled/macro/run/t5903d/Macros_1.scala
diff --git a/tests/pending/run/t5903d/Test_2.scala b/tests/disabled/macro/run/t5903d/Test_2.scala
index 5df60f024..5df60f024 100644
--- a/tests/pending/run/t5903d/Test_2.scala
+++ b/tests/disabled/macro/run/t5903d/Test_2.scala
diff --git a/tests/pending/run/t5923a.check b/tests/disabled/macro/run/t5923a.check
index 7165b734a..7165b734a 100644
--- a/tests/pending/run/t5923a.check
+++ b/tests/disabled/macro/run/t5923a.check
diff --git a/tests/pending/run/t5923a/Macros_1.scala b/tests/disabled/macro/run/t5923a/Macros_1.scala
index 9050fd4b1..9050fd4b1 100644
--- a/tests/pending/run/t5923a/Macros_1.scala
+++ b/tests/disabled/macro/run/t5923a/Macros_1.scala
diff --git a/tests/pending/run/t5923a/Test_2.scala b/tests/disabled/macro/run/t5923a/Test_2.scala
index 1f0413bdf..1f0413bdf 100644
--- a/tests/pending/run/t5923a/Test_2.scala
+++ b/tests/disabled/macro/run/t5923a/Test_2.scala
diff --git a/tests/pending/run/t5923d/Macros_1.scala b/tests/disabled/macro/run/t5923d/Macros_1.scala
index 1400674d4..1400674d4 100644
--- a/tests/pending/run/t5923d/Macros_1.scala
+++ b/tests/disabled/macro/run/t5923d/Macros_1.scala
diff --git a/tests/pending/run/t5923d/Test_2.scala b/tests/disabled/macro/run/t5923d/Test_2.scala
index e9c446209..e9c446209 100644
--- a/tests/pending/run/t5923d/Test_2.scala
+++ b/tests/disabled/macro/run/t5923d/Test_2.scala
diff --git a/tests/pending/run/t5940.scala b/tests/disabled/macro/run/t5940.scala
index 856070821..856070821 100644
--- a/tests/pending/run/t5940.scala
+++ b/tests/disabled/macro/run/t5940.scala
diff --git a/tests/pending/run/t6023.check b/tests/disabled/macro/run/t6023.check
index ee9356523..ee9356523 100644
--- a/tests/pending/run/t6023.check
+++ b/tests/disabled/macro/run/t6023.check
diff --git a/tests/pending/run/t6023.scala b/tests/disabled/macro/run/t6023.scala
index 9ec8724a4..9ec8724a4 100644
--- a/tests/pending/run/t6023.scala
+++ b/tests/disabled/macro/run/t6023.scala
diff --git a/tests/pending/run/t6187.check b/tests/disabled/macro/run/t6187.check
index 9a9e266ec..9a9e266ec 100644
--- a/tests/pending/run/t6187.check
+++ b/tests/disabled/macro/run/t6187.check
diff --git a/tests/pending/run/t6187.scala b/tests/disabled/macro/run/t6187.scala
index 7a39cfd9e..7a39cfd9e 100644
--- a/tests/pending/run/t6187.scala
+++ b/tests/disabled/macro/run/t6187.scala
diff --git a/tests/pending/run/t6187b.scala b/tests/disabled/macro/run/t6187b.scala
index 412880f38..412880f38 100644
--- a/tests/pending/run/t6187b.scala
+++ b/tests/disabled/macro/run/t6187b.scala
diff --git a/tests/pending/run/t6221.check b/tests/disabled/macro/run/t6221.check
index aa1bdd0e6..aa1bdd0e6 100644
--- a/tests/pending/run/t6221.check
+++ b/tests/disabled/macro/run/t6221.check
diff --git a/tests/pending/run/t6221/Macros_1.scala b/tests/disabled/macro/run/t6221/Macros_1.scala
index 0aeaa00c8..0aeaa00c8 100644
--- a/tests/pending/run/t6221/Macros_1.scala
+++ b/tests/disabled/macro/run/t6221/Macros_1.scala
diff --git a/tests/pending/run/t6221/Test_2.scala b/tests/disabled/macro/run/t6221/Test_2.scala
index bc295d437..bc295d437 100644
--- a/tests/pending/run/t6221/Test_2.scala
+++ b/tests/disabled/macro/run/t6221/Test_2.scala
diff --git a/tests/pending/run/t6379.check b/tests/disabled/macro/run/t6379.check
index 3e5dfec62..3e5dfec62 100644
--- a/tests/pending/run/t6379.check
+++ b/tests/disabled/macro/run/t6379.check
diff --git a/tests/pending/run/t6379/Macros_1.scala b/tests/disabled/macro/run/t6379/Macros_1.scala
index 4f3daf497..4f3daf497 100644
--- a/tests/pending/run/t6379/Macros_1.scala
+++ b/tests/disabled/macro/run/t6379/Macros_1.scala
diff --git a/tests/pending/run/t6379/Test_2.scala b/tests/disabled/macro/run/t6379/Test_2.scala
index 05bdd5575..05bdd5575 100644
--- a/tests/pending/run/t6379/Test_2.scala
+++ b/tests/disabled/macro/run/t6379/Test_2.scala
diff --git a/tests/pending/run/t6381.check b/tests/disabled/macro/run/t6381.check
index 49c6a784a..49c6a784a 100644
--- a/tests/pending/run/t6381.check
+++ b/tests/disabled/macro/run/t6381.check
diff --git a/tests/pending/run/t6381.scala b/tests/disabled/macro/run/t6381.scala
index 5a687c10c..5a687c10c 100644
--- a/tests/pending/run/t6381.scala
+++ b/tests/disabled/macro/run/t6381.scala
diff --git a/tests/pending/run/t6394a.check b/tests/disabled/macro/run/t6394a.check
index 2a02d41ce..2a02d41ce 100644
--- a/tests/pending/run/t6394a.check
+++ b/tests/disabled/macro/run/t6394a.check
diff --git a/tests/pending/run/t6394a.flags b/tests/disabled/macro/run/t6394a.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/t6394a.flags
+++ b/tests/disabled/macro/run/t6394a.flags
diff --git a/tests/pending/run/t6394a/Macros_1.scala b/tests/disabled/macro/run/t6394a/Macros_1.scala
index 376d85ba6..376d85ba6 100644
--- a/tests/pending/run/t6394a/Macros_1.scala
+++ b/tests/disabled/macro/run/t6394a/Macros_1.scala
diff --git a/tests/pending/run/t6394a/Test_2.scala b/tests/disabled/macro/run/t6394a/Test_2.scala
index 989ab3031..989ab3031 100644
--- a/tests/pending/run/t6394a/Test_2.scala
+++ b/tests/disabled/macro/run/t6394a/Test_2.scala
diff --git a/tests/pending/run/t6394b.check b/tests/disabled/macro/run/t6394b.check
index 2a02d41ce..2a02d41ce 100644
--- a/tests/pending/run/t6394b.check
+++ b/tests/disabled/macro/run/t6394b.check
diff --git a/tests/pending/run/t6394b.flags b/tests/disabled/macro/run/t6394b.flags
index cd66464f2..cd66464f2 100644
--- a/tests/pending/run/t6394b.flags
+++ b/tests/disabled/macro/run/t6394b.flags
diff --git a/tests/pending/run/t6394b/Macros_1.scala b/tests/disabled/macro/run/t6394b/Macros_1.scala
index 1a747816e..1a747816e 100644
--- a/tests/pending/run/t6394b/Macros_1.scala
+++ b/tests/disabled/macro/run/t6394b/Macros_1.scala
diff --git a/tests/pending/run/t6394b/Test_2.scala b/tests/disabled/macro/run/t6394b/Test_2.scala
index 989ab3031..989ab3031 100644
--- a/tests/pending/run/t6394b/Test_2.scala
+++ b/tests/disabled/macro/run/t6394b/Test_2.scala
diff --git a/tests/pending/run/t6591_1.check b/tests/disabled/macro/run/t6591_1.check
index d1d448f28..d1d448f28 100644
--- a/tests/pending/run/t6591_1.check
+++ b/tests/disabled/macro/run/t6591_1.check
diff --git a/tests/pending/run/t6591_1.scala b/tests/disabled/macro/run/t6591_1.scala
index 8c152f68a..8c152f68a 100644
--- a/tests/pending/run/t6591_1.scala
+++ b/tests/disabled/macro/run/t6591_1.scala
diff --git a/tests/pending/run/t6591_2.check b/tests/disabled/macro/run/t6591_2.check
index a2930b174..a2930b174 100644
--- a/tests/pending/run/t6591_2.check
+++ b/tests/disabled/macro/run/t6591_2.check
diff --git a/tests/pending/run/t6591_2.scala b/tests/disabled/macro/run/t6591_2.scala
index 9e6c917e8..9e6c917e8 100644
--- a/tests/pending/run/t6591_2.scala
+++ b/tests/disabled/macro/run/t6591_2.scala
diff --git a/tests/pending/run/t6591_3.check b/tests/disabled/macro/run/t6591_3.check
index 362aafd11..362aafd11 100644
--- a/tests/pending/run/t6591_3.check
+++ b/tests/disabled/macro/run/t6591_3.check
diff --git a/tests/pending/run/t6591_3.scala b/tests/disabled/macro/run/t6591_3.scala
index 5069b800e..5069b800e 100644
--- a/tests/pending/run/t6591_3.scala
+++ b/tests/disabled/macro/run/t6591_3.scala
diff --git a/tests/pending/run/t6591_5.check b/tests/disabled/macro/run/t6591_5.check
index 4ebc2236a..4ebc2236a 100644
--- a/tests/pending/run/t6591_5.check
+++ b/tests/disabled/macro/run/t6591_5.check
diff --git a/tests/pending/run/t6591_5.scala b/tests/disabled/macro/run/t6591_5.scala
index dfb4cd5ad..dfb4cd5ad 100644
--- a/tests/pending/run/t6591_5.scala
+++ b/tests/disabled/macro/run/t6591_5.scala
diff --git a/tests/pending/run/t6591_6.check b/tests/disabled/macro/run/t6591_6.check
index 940e2026f..940e2026f 100644
--- a/tests/pending/run/t6591_6.check
+++ b/tests/disabled/macro/run/t6591_6.check
diff --git a/tests/pending/run/t6591_6.scala b/tests/disabled/macro/run/t6591_6.scala
index afb2da229..afb2da229 100644
--- a/tests/pending/run/t6591_6.scala
+++ b/tests/disabled/macro/run/t6591_6.scala
diff --git a/tests/pending/run/t6591_7.check b/tests/disabled/macro/run/t6591_7.check
index e21a3669b..e21a3669b 100644
--- a/tests/pending/run/t6591_7.check
+++ b/tests/disabled/macro/run/t6591_7.check
diff --git a/tests/pending/run/t6591_7.scala b/tests/disabled/macro/run/t6591_7.scala
index cec0d2cda..cec0d2cda 100644
--- a/tests/pending/run/t6591_7.scala
+++ b/tests/disabled/macro/run/t6591_7.scala
diff --git a/tests/pending/run/t6662.check b/tests/disabled/macro/run/t6662.check
index 6a452c185..6a452c185 100644
--- a/tests/pending/run/t6662.check
+++ b/tests/disabled/macro/run/t6662.check
diff --git a/tests/pending/run/t6662/Macro_1.scala b/tests/disabled/macro/run/t6662/Macro_1.scala
index 419859772..419859772 100644
--- a/tests/pending/run/t6662/Macro_1.scala
+++ b/tests/disabled/macro/run/t6662/Macro_1.scala
diff --git a/tests/pending/run/t6662/Test_2.scala b/tests/disabled/macro/run/t6662/Test_2.scala
index 82ac54cb4..82ac54cb4 100644
--- a/tests/pending/run/t6662/Test_2.scala
+++ b/tests/disabled/macro/run/t6662/Test_2.scala
diff --git a/tests/pending/run/t6814.check b/tests/disabled/macro/run/t6814.check
index 97ada7720..97ada7720 100644
--- a/tests/pending/run/t6814.check
+++ b/tests/disabled/macro/run/t6814.check
diff --git a/tests/pending/run/t6814/Macros_1.scala b/tests/disabled/macro/run/t6814/Macros_1.scala
index 0257f451d..0257f451d 100644
--- a/tests/pending/run/t6814/Macros_1.scala
+++ b/tests/disabled/macro/run/t6814/Macros_1.scala
diff --git a/tests/pending/run/t6814/Test_2.scala b/tests/disabled/macro/run/t6814/Test_2.scala
index 0fc472aa6..0fc472aa6 100644
--- a/tests/pending/run/t6814/Test_2.scala
+++ b/tests/disabled/macro/run/t6814/Test_2.scala
diff --git a/tests/pending/run/t6992.check b/tests/disabled/macro/run/t6992.check
index 021f32ec9..021f32ec9 100644
--- a/tests/pending/run/t6992.check
+++ b/tests/disabled/macro/run/t6992.check
diff --git a/tests/pending/run/t6992/Macros_1.scala b/tests/disabled/macro/run/t6992/Macros_1.scala
index f578f2b3c..f578f2b3c 100644
--- a/tests/pending/run/t6992/Macros_1.scala
+++ b/tests/disabled/macro/run/t6992/Macros_1.scala
diff --git a/tests/pending/run/t6992/Test_2.scala b/tests/disabled/macro/run/t6992/Test_2.scala
index 5d1a64eac..5d1a64eac 100644
--- a/tests/pending/run/t6992/Test_2.scala
+++ b/tests/disabled/macro/run/t6992/Test_2.scala
diff --git a/tests/pending/run/t7008-scala-defined.check b/tests/disabled/macro/run/t7008-scala-defined.check
index 84ed62619..84ed62619 100644
--- a/tests/pending/run/t7008-scala-defined.check
+++ b/tests/disabled/macro/run/t7008-scala-defined.check
diff --git a/tests/pending/run/t7008-scala-defined.flags b/tests/disabled/macro/run/t7008-scala-defined.flags
index 49f2d2c4c..49f2d2c4c 100644
--- a/tests/pending/run/t7008-scala-defined.flags
+++ b/tests/disabled/macro/run/t7008-scala-defined.flags
diff --git a/tests/pending/run/t7008-scala-defined/Impls_Macros_2.scala b/tests/disabled/macro/run/t7008-scala-defined/Impls_Macros_2.scala
index 330db8da7..330db8da7 100644
--- a/tests/pending/run/t7008-scala-defined/Impls_Macros_2.scala
+++ b/tests/disabled/macro/run/t7008-scala-defined/Impls_Macros_2.scala
diff --git a/tests/pending/run/t7008-scala-defined/ScalaClassWithCheckedExceptions_1.scala b/tests/disabled/macro/run/t7008-scala-defined/ScalaClassWithCheckedExceptions_1.scala
index 7783c873e..7783c873e 100644
--- a/tests/pending/run/t7008-scala-defined/ScalaClassWithCheckedExceptions_1.scala
+++ b/tests/disabled/macro/run/t7008-scala-defined/ScalaClassWithCheckedExceptions_1.scala
diff --git a/tests/pending/run/t7008-scala-defined/Test_3.scala b/tests/disabled/macro/run/t7008-scala-defined/Test_3.scala
index 23adb88b2..23adb88b2 100644
--- a/tests/pending/run/t7008-scala-defined/Test_3.scala
+++ b/tests/disabled/macro/run/t7008-scala-defined/Test_3.scala
diff --git a/tests/pending/run/t7008.check b/tests/disabled/macro/run/t7008.check
index ee077f90f..ee077f90f 100644
--- a/tests/pending/run/t7008.check
+++ b/tests/disabled/macro/run/t7008.check
diff --git a/tests/pending/run/t7008/Impls_Macros_2.scala b/tests/disabled/macro/run/t7008/Impls_Macros_2.scala
index 3c6fe116c..3c6fe116c 100644
--- a/tests/pending/run/t7008/Impls_Macros_2.scala
+++ b/tests/disabled/macro/run/t7008/Impls_Macros_2.scala
diff --git a/tests/pending/run/t7008/JavaClassWithCheckedExceptions_1.java b/tests/disabled/macro/run/t7008/JavaClassWithCheckedExceptions_1.java
index dda212830..dda212830 100644
--- a/tests/pending/run/t7008/JavaClassWithCheckedExceptions_1.java
+++ b/tests/disabled/macro/run/t7008/JavaClassWithCheckedExceptions_1.java
diff --git a/tests/pending/run/t7008/Test_3.scala b/tests/disabled/macro/run/t7008/Test_3.scala
index 00e0eb684..00e0eb684 100644
--- a/tests/pending/run/t7008/Test_3.scala
+++ b/tests/disabled/macro/run/t7008/Test_3.scala
diff --git a/tests/pending/run/t7044.check b/tests/disabled/macro/run/t7044.check
index ab523873b..ab523873b 100644
--- a/tests/pending/run/t7044.check
+++ b/tests/disabled/macro/run/t7044.check
diff --git a/tests/pending/run/t7044/Macros_1.scala b/tests/disabled/macro/run/t7044/Macros_1.scala
index 3b3f8c338..3b3f8c338 100644
--- a/tests/pending/run/t7044/Macros_1.scala
+++ b/tests/disabled/macro/run/t7044/Macros_1.scala
diff --git a/tests/pending/run/t7044/Test_2.scala b/tests/disabled/macro/run/t7044/Test_2.scala
index e7a34d04c..e7a34d04c 100644
--- a/tests/pending/run/t7044/Test_2.scala
+++ b/tests/disabled/macro/run/t7044/Test_2.scala
diff --git a/tests/pending/run/t7047.check b/tests/disabled/macro/run/t7047.check
index 32bd58109..32bd58109 100644
--- a/tests/pending/run/t7047.check
+++ b/tests/disabled/macro/run/t7047.check
diff --git a/tests/pending/run/t7047/Impls_Macros_1.scala b/tests/disabled/macro/run/t7047/Impls_Macros_1.scala
index 787ea6cfe..787ea6cfe 100644
--- a/tests/pending/run/t7047/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/t7047/Impls_Macros_1.scala
diff --git a/tests/pending/run/t7047/Test_2.scala b/tests/disabled/macro/run/t7047/Test_2.scala
index 0fc472aa6..0fc472aa6 100644
--- a/tests/pending/run/t7047/Test_2.scala
+++ b/tests/disabled/macro/run/t7047/Test_2.scala
diff --git a/tests/pending/run/t7157.check b/tests/disabled/macro/run/t7157.check
index d00491fd7..d00491fd7 100644
--- a/tests/pending/run/t7157.check
+++ b/tests/disabled/macro/run/t7157.check
diff --git a/tests/pending/run/t7157/Impls_Macros_1.scala b/tests/disabled/macro/run/t7157/Impls_Macros_1.scala
index cc258b016..cc258b016 100644
--- a/tests/pending/run/t7157/Impls_Macros_1.scala
+++ b/tests/disabled/macro/run/t7157/Impls_Macros_1.scala
diff --git a/tests/pending/run/t7157/Test_2.scala b/tests/disabled/macro/run/t7157/Test_2.scala
index be0d54d75..be0d54d75 100644
--- a/tests/pending/run/t7157/Test_2.scala
+++ b/tests/disabled/macro/run/t7157/Test_2.scala
diff --git a/tests/pending/run/t7185.check b/tests/disabled/macro/run/t7185.check
index e4f80a8ff..e4f80a8ff 100644
--- a/tests/pending/run/t7185.check
+++ b/tests/disabled/macro/run/t7185.check
diff --git a/tests/pending/run/t7185.scala b/tests/disabled/macro/run/t7185.scala
index 62d64246b..62d64246b 100644
--- a/tests/pending/run/t7185.scala
+++ b/tests/disabled/macro/run/t7185.scala
diff --git a/tests/pending/run/t7235.check b/tests/disabled/macro/run/t7235.check
index 9cb9c55a0..9cb9c55a0 100644
--- a/tests/pending/run/t7235.check
+++ b/tests/disabled/macro/run/t7235.check
diff --git a/tests/pending/run/t7235.scala b/tests/disabled/macro/run/t7235.scala
index 2e6af545d..2e6af545d 100644
--- a/tests/pending/run/t7235.scala
+++ b/tests/disabled/macro/run/t7235.scala
diff --git a/tests/pending/run/t7240/Macros_1.scala b/tests/disabled/macro/run/t7240/Macros_1.scala
index b24b607d1..b24b607d1 100644
--- a/tests/pending/run/t7240/Macros_1.scala
+++ b/tests/disabled/macro/run/t7240/Macros_1.scala
diff --git a/tests/pending/run/t7240/Test_2.scala b/tests/disabled/macro/run/t7240/Test_2.scala
index 27d2893d3..27d2893d3 100644
--- a/tests/pending/run/t7240/Test_2.scala
+++ b/tests/disabled/macro/run/t7240/Test_2.scala
diff --git a/tests/pending/run/t7375b.check b/tests/disabled/macro/run/t7375b.check
index d7578e28b..d7578e28b 100644
--- a/tests/pending/run/t7375b.check
+++ b/tests/disabled/macro/run/t7375b.check
diff --git a/tests/pending/run/t7375b/Macros_1.scala b/tests/disabled/macro/run/t7375b/Macros_1.scala
index b6090e730..b6090e730 100644
--- a/tests/pending/run/t7375b/Macros_1.scala
+++ b/tests/disabled/macro/run/t7375b/Macros_1.scala
diff --git a/tests/pending/run/t7375b/Test_2.scala b/tests/disabled/macro/run/t7375b/Test_2.scala
index 0fc472aa6..0fc472aa6 100644
--- a/tests/pending/run/t7375b/Test_2.scala
+++ b/tests/disabled/macro/run/t7375b/Test_2.scala
diff --git a/tests/pending/run/t7558.scala b/tests/disabled/macro/run/t7558.scala
index 26163555f..26163555f 100644
--- a/tests/pending/run/t7558.scala
+++ b/tests/disabled/macro/run/t7558.scala
diff --git a/tests/pending/run/t7617a.check b/tests/disabled/macro/run/t7617a.check
index 94954abda..94954abda 100644
--- a/tests/pending/run/t7617a.check
+++ b/tests/disabled/macro/run/t7617a.check
diff --git a/tests/pending/run/t7617a/Macros_1.scala b/tests/disabled/macro/run/t7617a/Macros_1.scala
index 77b18c20e..77b18c20e 100644
--- a/tests/pending/run/t7617a/Macros_1.scala
+++ b/tests/disabled/macro/run/t7617a/Macros_1.scala
diff --git a/tests/pending/run/t7617a/Test_2.scala b/tests/disabled/macro/run/t7617a/Test_2.scala
index aaf268a8c..aaf268a8c 100644
--- a/tests/pending/run/t7617a/Test_2.scala
+++ b/tests/disabled/macro/run/t7617a/Test_2.scala
diff --git a/tests/pending/run/t7617b.check b/tests/disabled/macro/run/t7617b.check
index 81ec7e8b7..81ec7e8b7 100644
--- a/tests/pending/run/t7617b.check
+++ b/tests/disabled/macro/run/t7617b.check
diff --git a/tests/pending/run/t7617b/Macros_1.scala b/tests/disabled/macro/run/t7617b/Macros_1.scala
index 90fcfda47..90fcfda47 100644
--- a/tests/pending/run/t7617b/Macros_1.scala
+++ b/tests/disabled/macro/run/t7617b/Macros_1.scala
diff --git a/tests/pending/run/t7617b/Test_2.scala b/tests/disabled/macro/run/t7617b/Test_2.scala
index 0ce77a1c7..0ce77a1c7 100644
--- a/tests/pending/run/t7617b/Test_2.scala
+++ b/tests/disabled/macro/run/t7617b/Test_2.scala
diff --git a/tests/pending/run/t7657.check b/tests/disabled/macro/run/t7657.check
index c25d8d1c1..c25d8d1c1 100644
--- a/tests/pending/run/t7657.check
+++ b/tests/disabled/macro/run/t7657.check
diff --git a/tests/pending/run/t7657/Macros_1.scala b/tests/disabled/macro/run/t7657/Macros_1.scala
index a883f76bc..a883f76bc 100644
--- a/tests/pending/run/t7657/Macros_1.scala
+++ b/tests/disabled/macro/run/t7657/Macros_1.scala
diff --git a/tests/pending/run/t7657/Test_2.scala b/tests/disabled/macro/run/t7657/Test_2.scala
index 68dfb5c8b..68dfb5c8b 100644
--- a/tests/pending/run/t7657/Test_2.scala
+++ b/tests/disabled/macro/run/t7657/Test_2.scala
diff --git a/tests/pending/run/t7777.check b/tests/disabled/macro/run/t7777.check
index 162ff2d2a..162ff2d2a 100644
--- a/tests/pending/run/t7777.check
+++ b/tests/disabled/macro/run/t7777.check
diff --git a/tests/pending/run/t7777/Macros_1.scala b/tests/disabled/macro/run/t7777/Macros_1.scala
index 1dc6d6740..1dc6d6740 100644
--- a/tests/pending/run/t7777/Macros_1.scala
+++ b/tests/disabled/macro/run/t7777/Macros_1.scala
diff --git a/tests/pending/run/t7777/Test_2.scala b/tests/disabled/macro/run/t7777/Test_2.scala
index 7f84f64e4..7f84f64e4 100644
--- a/tests/pending/run/t7777/Test_2.scala
+++ b/tests/disabled/macro/run/t7777/Test_2.scala
diff --git a/tests/pending/run/t7868b.check b/tests/disabled/macro/run/t7868b.check
index 6577c4bc4..6577c4bc4 100644
--- a/tests/pending/run/t7868b.check
+++ b/tests/disabled/macro/run/t7868b.check
diff --git a/tests/pending/run/t7868b.scala b/tests/disabled/macro/run/t7868b.scala
index 33d33f10a..33d33f10a 100644
--- a/tests/pending/run/t7868b.scala
+++ b/tests/disabled/macro/run/t7868b.scala
diff --git a/tests/pending/run/t7871.check b/tests/disabled/macro/run/t7871.check
index ce6efd812..ce6efd812 100644
--- a/tests/pending/run/t7871.check
+++ b/tests/disabled/macro/run/t7871.check
diff --git a/tests/pending/run/t7871/Macros_1.scala b/tests/disabled/macro/run/t7871/Macros_1.scala
index dca250812..dca250812 100644
--- a/tests/pending/run/t7871/Macros_1.scala
+++ b/tests/disabled/macro/run/t7871/Macros_1.scala
diff --git a/tests/pending/run/t7871/Test_2.scala b/tests/disabled/macro/run/t7871/Test_2.scala
index 55a8320b3..55a8320b3 100644
--- a/tests/pending/run/t7871/Test_2.scala
+++ b/tests/disabled/macro/run/t7871/Test_2.scala
diff --git a/tests/pending/run/t8048a.check b/tests/disabled/macro/run/t8048a.check
index 8fb9e26e8..8fb9e26e8 100644
--- a/tests/pending/run/t8048a.check
+++ b/tests/disabled/macro/run/t8048a.check
diff --git a/tests/pending/run/t8048a/Macros_1.scala b/tests/disabled/macro/run/t8048a/Macros_1.scala
index d13e851d9..d13e851d9 100644
--- a/tests/pending/run/t8048a/Macros_1.scala
+++ b/tests/disabled/macro/run/t8048a/Macros_1.scala
diff --git a/tests/pending/run/t8048a/Test_2.scala b/tests/disabled/macro/run/t8048a/Test_2.scala
index 623a22a3a..623a22a3a 100644
--- a/tests/pending/run/t8048a/Test_2.scala
+++ b/tests/disabled/macro/run/t8048a/Test_2.scala
diff --git a/tests/pending/run/t8048b.check b/tests/disabled/macro/run/t8048b.check
index 083edaac2..083edaac2 100644
--- a/tests/pending/run/t8048b.check
+++ b/tests/disabled/macro/run/t8048b.check
diff --git a/tests/pending/run/t8048b/Macros_1.scala b/tests/disabled/macro/run/t8048b/Macros_1.scala
index 520a6fac0..520a6fac0 100644
--- a/tests/pending/run/t8048b/Macros_1.scala
+++ b/tests/disabled/macro/run/t8048b/Macros_1.scala
diff --git a/tests/pending/run/t8048b/Test_2.scala b/tests/disabled/macro/run/t8048b/Test_2.scala
index 8474a34ec..8474a34ec 100644
--- a/tests/pending/run/t8048b/Test_2.scala
+++ b/tests/disabled/macro/run/t8048b/Test_2.scala
diff --git a/tests/pending/run/t8104.check b/tests/disabled/macro/run/t8104.check
index 40523a286..40523a286 100644
--- a/tests/pending/run/t8104.check
+++ b/tests/disabled/macro/run/t8104.check
diff --git a/tests/pending/run/t8104/Macros_1.scala b/tests/disabled/macro/run/t8104/Macros_1.scala
index e135bd807..e135bd807 100644
--- a/tests/pending/run/t8104/Macros_1.scala
+++ b/tests/disabled/macro/run/t8104/Macros_1.scala
diff --git a/tests/pending/run/t8104/Test_2.scala b/tests/disabled/macro/run/t8104/Test_2.scala
index 4e97cdf9d..4e97cdf9d 100644
--- a/tests/pending/run/t8104/Test_2.scala
+++ b/tests/disabled/macro/run/t8104/Test_2.scala
diff --git a/tests/pending/run/t8192.check b/tests/disabled/macro/run/t8192.check
index 2423a7acb..2423a7acb 100644
--- a/tests/pending/run/t8192.check
+++ b/tests/disabled/macro/run/t8192.check
diff --git a/tests/pending/run/t8192/Macros_1.scala b/tests/disabled/macro/run/t8192/Macros_1.scala
index 72fb2cf31..72fb2cf31 100644
--- a/tests/pending/run/t8192/Macros_1.scala
+++ b/tests/disabled/macro/run/t8192/Macros_1.scala
diff --git a/tests/pending/run/t8192/Test_2.scala b/tests/disabled/macro/run/t8192/Test_2.scala
index dec90ab66..dec90ab66 100644
--- a/tests/pending/run/t8192/Test_2.scala
+++ b/tests/disabled/macro/run/t8192/Test_2.scala
diff --git a/tests/pending/run/t8321.check b/tests/disabled/macro/run/t8321.check
index 0cfbf0888..0cfbf0888 100644
--- a/tests/pending/run/t8321.check
+++ b/tests/disabled/macro/run/t8321.check
diff --git a/tests/pending/run/t8321/Macros_1.scala b/tests/disabled/macro/run/t8321/Macros_1.scala
index 70e44fc76..70e44fc76 100644
--- a/tests/pending/run/t8321/Macros_1.scala
+++ b/tests/disabled/macro/run/t8321/Macros_1.scala
diff --git a/tests/pending/run/t8321/Test_2.scala b/tests/disabled/macro/run/t8321/Test_2.scala
index d49442117..d49442117 100644
--- a/tests/pending/run/t8321/Test_2.scala
+++ b/tests/disabled/macro/run/t8321/Test_2.scala
diff --git a/tests/pending/run/t8425.check b/tests/disabled/macro/run/t8425.check
index 8379fa0a7..8379fa0a7 100644
--- a/tests/pending/run/t8425.check
+++ b/tests/disabled/macro/run/t8425.check
diff --git a/tests/pending/run/t8425/Macros_1.scala b/tests/disabled/macro/run/t8425/Macros_1.scala
index 71a96518e..71a96518e 100644
--- a/tests/pending/run/t8425/Macros_1.scala
+++ b/tests/disabled/macro/run/t8425/Macros_1.scala
diff --git a/tests/pending/run/t8425/Test_2.scala b/tests/disabled/macro/run/t8425/Test_2.scala
index 0fc472aa6..0fc472aa6 100644
--- a/tests/pending/run/t8425/Test_2.scala
+++ b/tests/disabled/macro/run/t8425/Test_2.scala
diff --git a/tests/pending/run/t8437.check b/tests/disabled/macro/run/t8437.check
index fd3c81a4d..fd3c81a4d 100644
--- a/tests/pending/run/t8437.check
+++ b/tests/disabled/macro/run/t8437.check
diff --git a/tests/pending/run/t8437/Macros_1.scala b/tests/disabled/macro/run/t8437/Macros_1.scala
index 6286ea2a8..6286ea2a8 100644
--- a/tests/pending/run/t8437/Macros_1.scala
+++ b/tests/disabled/macro/run/t8437/Macros_1.scala
diff --git a/tests/pending/run/t8437/Test_2.scala b/tests/disabled/macro/run/t8437/Test_2.scala
index fef54005f..fef54005f 100644
--- a/tests/pending/run/t8437/Test_2.scala
+++ b/tests/disabled/macro/run/t8437/Test_2.scala
diff --git a/tests/pending/run/toolbox_console_reporter.check b/tests/disabled/macro/run/toolbox_console_reporter.check
index 1395c6874..1395c6874 100644
--- a/tests/pending/run/toolbox_console_reporter.check
+++ b/tests/disabled/macro/run/toolbox_console_reporter.check
diff --git a/tests/pending/run/toolbox_console_reporter.scala b/tests/disabled/macro/run/toolbox_console_reporter.scala
index 53cbcb0fb..53cbcb0fb 100644
--- a/tests/pending/run/toolbox_console_reporter.scala
+++ b/tests/disabled/macro/run/toolbox_console_reporter.scala
diff --git a/tests/pending/run/toolbox_current_run_compiles.check b/tests/disabled/macro/run/toolbox_current_run_compiles.check
index da29283aa..da29283aa 100644
--- a/tests/pending/run/toolbox_current_run_compiles.check
+++ b/tests/disabled/macro/run/toolbox_current_run_compiles.check
diff --git a/tests/pending/run/toolbox_current_run_compiles.scala b/tests/disabled/macro/run/toolbox_current_run_compiles.scala
index 702741c2e..702741c2e 100644
--- a/tests/pending/run/toolbox_current_run_compiles.scala
+++ b/tests/disabled/macro/run/toolbox_current_run_compiles.scala
diff --git a/tests/pending/run/toolbox_default_reporter_is_silent.check b/tests/disabled/macro/run/toolbox_default_reporter_is_silent.check
index ce0136250..ce0136250 100644
--- a/tests/pending/run/toolbox_default_reporter_is_silent.check
+++ b/tests/disabled/macro/run/toolbox_default_reporter_is_silent.check
diff --git a/tests/pending/run/toolbox_default_reporter_is_silent.scala b/tests/disabled/macro/run/toolbox_default_reporter_is_silent.scala
index 694720721..694720721 100644
--- a/tests/pending/run/toolbox_default_reporter_is_silent.scala
+++ b/tests/disabled/macro/run/toolbox_default_reporter_is_silent.scala
diff --git a/tests/pending/run/toolbox_silent_reporter.check b/tests/disabled/macro/run/toolbox_silent_reporter.check
index 2d05b1e3f..2d05b1e3f 100644
--- a/tests/pending/run/toolbox_silent_reporter.check
+++ b/tests/disabled/macro/run/toolbox_silent_reporter.check
diff --git a/tests/pending/run/toolbox_silent_reporter.scala b/tests/disabled/macro/run/toolbox_silent_reporter.scala
index 72109b822..72109b822 100644
--- a/tests/pending/run/toolbox_silent_reporter.scala
+++ b/tests/disabled/macro/run/toolbox_silent_reporter.scala
diff --git a/tests/pending/run/toolbox_typecheck_macrosdisabled.check b/tests/disabled/macro/run/toolbox_typecheck_macrosdisabled.check
index 62de37582..62de37582 100644
--- a/tests/pending/run/toolbox_typecheck_macrosdisabled.check
+++ b/tests/disabled/macro/run/toolbox_typecheck_macrosdisabled.check
diff --git a/tests/pending/run/toolbox_typecheck_macrosdisabled.scala b/tests/disabled/macro/run/toolbox_typecheck_macrosdisabled.scala
index 2aa0202e7..2aa0202e7 100644
--- a/tests/pending/run/toolbox_typecheck_macrosdisabled.scala
+++ b/tests/disabled/macro/run/toolbox_typecheck_macrosdisabled.scala
diff --git a/tests/pending/run/toolbox_typecheck_macrosdisabled2.check b/tests/disabled/macro/run/toolbox_typecheck_macrosdisabled2.check
index 86f89504d..86f89504d 100644
--- a/tests/pending/run/toolbox_typecheck_macrosdisabled2.check
+++ b/tests/disabled/macro/run/toolbox_typecheck_macrosdisabled2.check
diff --git a/tests/pending/run/toolbox_typecheck_macrosdisabled2.scala b/tests/disabled/macro/run/toolbox_typecheck_macrosdisabled2.scala
index c554110ed..c554110ed 100644
--- a/tests/pending/run/toolbox_typecheck_macrosdisabled2.scala
+++ b/tests/disabled/macro/run/toolbox_typecheck_macrosdisabled2.scala
diff --git a/tests/pending/run/typecheck.check b/tests/disabled/macro/run/typecheck.check
index e69de29bb..e69de29bb 100644
--- a/tests/pending/run/typecheck.check
+++ b/tests/disabled/macro/run/typecheck.check
diff --git a/tests/pending/run/typecheck/Macros_1.scala b/tests/disabled/macro/run/typecheck/Macros_1.scala
index ee1c8da76..ee1c8da76 100644
--- a/tests/pending/run/typecheck/Macros_1.scala
+++ b/tests/disabled/macro/run/typecheck/Macros_1.scala
diff --git a/tests/pending/run/typecheck/Test_2.scala b/tests/disabled/macro/run/typecheck/Test_2.scala
index b79cc3b31..b79cc3b31 100644
--- a/tests/pending/run/typecheck/Test_2.scala
+++ b/tests/disabled/macro/run/typecheck/Test_2.scala
diff --git a/tests/pending/run/typed-annotated.check b/tests/disabled/macro/run/typed-annotated.check
index d81cc0710..d81cc0710 100644
--- a/tests/pending/run/typed-annotated.check
+++ b/tests/disabled/macro/run/typed-annotated.check
diff --git a/tests/pending/run/typed-annotated/Macros_1.scala b/tests/disabled/macro/run/typed-annotated/Macros_1.scala
index 4f0660dc4..4f0660dc4 100644
--- a/tests/pending/run/typed-annotated/Macros_1.scala
+++ b/tests/disabled/macro/run/typed-annotated/Macros_1.scala
diff --git a/tests/pending/run/typed-annotated/Test_2.scala b/tests/disabled/macro/run/typed-annotated/Test_2.scala
index 0fc472aa6..0fc472aa6 100644
--- a/tests/pending/run/typed-annotated/Test_2.scala
+++ b/tests/disabled/macro/run/typed-annotated/Test_2.scala