diff --git a/tests/functional/lang/eval-okay-attrs6.flags b/tests/functional/lang/eval-okay-attrs6.flags
deleted file mode 100644
index a0e513a81..000000000
--- a/tests/functional/lang/eval-okay-attrs6.flags
+++ /dev/null
@@ -1 +0,0 @@
---extra-deprecated-features rec-set-overrides
diff --git a/tests/functional/lang/eval-okay-attrs6.exp b/tests/functional2/lang/attrs-__overrides/eval-okay.out.exp
similarity index 100%
rename from tests/functional/lang/eval-okay-attrs6.exp
rename to tests/functional2/lang/attrs-__overrides/eval-okay.out.exp
diff --git a/tests/functional/lang/eval-okay-attrs6.nix b/tests/functional2/lang/attrs-__overrides/in.nix
similarity index 100%
rename from tests/functional/lang/eval-okay-attrs6.nix
rename to tests/functional2/lang/attrs-__overrides/in.nix
diff --git a/tests/functional2/lang/attrs-__overrides/test.toml b/tests/functional2/lang/attrs-__overrides/test.toml
new file mode 100644
index 000000000..13d17947e
--- /dev/null
+++ b/tests/functional2/lang/attrs-__overrides/test.toml
@@ -0,0 +1,3 @@
+[[test]]
+runner = "eval-okay"
+flags = [ "--extra-deprecated-features", "rec-set-overrides" ]
diff --git a/tests/functional2/lang/dup-attrs/eval-fail-dynamic-attrs.err.exp b/tests/functional2/lang/attrs-dynamic/eval-fail-duplicate.err.exp
similarity index 100%
rename from tests/functional2/lang/dup-attrs/eval-fail-dynamic-attrs.err.exp
rename to tests/functional2/lang/attrs-dynamic/eval-fail-duplicate.err.exp
diff --git a/tests/functional/lang/eval-okay-dynamic-attrs-2.exp b/tests/functional2/lang/attrs-dynamic/eval-okay-2.out.exp
similarity index 100%
rename from tests/functional/lang/eval-okay-dynamic-attrs-2.exp
rename to tests/functional2/lang/attrs-dynamic/eval-okay-2.out.exp
diff --git a/tests/functional/lang/eval-okay-dynamic-attrs-bare.exp b/tests/functional2/lang/attrs-dynamic/eval-okay-bare.out.exp
similarity index 100%
rename from tests/functional/lang/eval-okay-dynamic-attrs-bare.exp
rename to tests/functional2/lang/attrs-dynamic/eval-okay-bare.out.exp
diff --git a/tests/functional2/lang/merge-dynamic-attrs/eval-okay.out.exp b/tests/functional2/lang/attrs-dynamic/eval-okay-merge.out.exp
similarity index 100%
rename from tests/functional2/lang/merge-dynamic-attrs/eval-okay.out.exp
rename to tests/functional2/lang/attrs-dynamic/eval-okay-merge.out.exp
diff --git a/tests/functional/lang/eval-okay-strings-as-attrs-names.exp b/tests/functional2/lang/attrs-dynamic/eval-okay-null.out.exp
similarity index 100%
rename from tests/functional/lang/eval-okay-strings-as-attrs-names.exp
rename to tests/functional2/lang/attrs-dynamic/eval-okay-null.out.exp
diff --git a/tests/functional/lang/eval-okay-dynamic-attrs.exp b/tests/functional2/lang/attrs-dynamic/eval-okay.out.exp
similarity index 100%
rename from tests/functional/lang/eval-okay-dynamic-attrs.exp
rename to tests/functional2/lang/attrs-dynamic/eval-okay.out.exp
diff --git a/tests/functional/lang/eval-okay-dynamic-attrs-2.nix b/tests/functional2/lang/attrs-dynamic/in-2.nix
similarity index 100%
rename from tests/functional/lang/eval-okay-dynamic-attrs-2.nix
rename to tests/functional2/lang/attrs-dynamic/in-2.nix
diff --git a/tests/functional/lang/eval-okay-dynamic-attrs-bare.nix b/tests/functional2/lang/attrs-dynamic/in-bare.nix
similarity index 100%
rename from tests/functional/lang/eval-okay-dynamic-attrs-bare.nix
rename to tests/functional2/lang/attrs-dynamic/in-bare.nix
diff --git a/tests/functional2/lang/dup-attrs/in-dynamic-attrs.nix b/tests/functional2/lang/attrs-dynamic/in-duplicate.nix
similarity index 100%
rename from tests/functional2/lang/dup-attrs/in-dynamic-attrs.nix
rename to tests/functional2/lang/attrs-dynamic/in-duplicate.nix
diff --git a/tests/functional2/lang/merge-dynamic-attrs/in.nix b/tests/functional2/lang/attrs-dynamic/in-merge.nix
similarity index 100%
rename from tests/functional2/lang/merge-dynamic-attrs/in.nix
rename to tests/functional2/lang/attrs-dynamic/in-merge.nix
diff --git a/tests/functional2/lang/null-dynamic-attrs/in.nix b/tests/functional2/lang/attrs-dynamic/in-null.nix
similarity index 100%
rename from tests/functional2/lang/null-dynamic-attrs/in.nix
rename to tests/functional2/lang/attrs-dynamic/in-null.nix
diff --git a/tests/functional/lang/eval-okay-dynamic-attrs.nix b/tests/functional2/lang/attrs-dynamic/in.nix
similarity index 100%
rename from tests/functional/lang/eval-okay-dynamic-attrs.nix
rename to tests/functional2/lang/attrs-dynamic/in.nix
diff --git a/tests/functional2/lang/dup-attrs/eval-fail-deep.err.exp b/tests/functional2/lang/attrs/eval-fail-duplicate-deep.err.exp
similarity index 100%
rename from tests/functional2/lang/dup-attrs/eval-fail-deep.err.exp
rename to tests/functional2/lang/attrs/eval-fail-duplicate-deep.err.exp
diff --git a/tests/functional2/lang/dup-attrs/eval-fail-inherit.err.exp b/tests/functional2/lang/attrs/eval-fail-duplicate-inherit.err.exp
similarity index 100%
rename from tests/functional2/lang/dup-attrs/eval-fail-inherit.err.exp
rename to tests/functional2/lang/attrs/eval-fail-duplicate-inherit.err.exp
diff --git a/tests/functional2/lang/dup-attrs/eval-fail.err.exp b/tests/functional2/lang/attrs/eval-fail-duplicate.err.exp
similarity index 100%
rename from tests/functional2/lang/dup-attrs/eval-fail.err.exp
rename to tests/functional2/lang/attrs/eval-fail-duplicate.err.exp
diff --git a/tests/functional2/lang/attr-fallback-trace/eval-fail.err.exp b/tests/functional2/lang/attrs/eval-fail-fallback-trace.err.exp
similarity index 100%
rename from tests/functional2/lang/attr-fallback-trace/eval-fail.err.exp
rename to tests/functional2/lang/attrs/eval-fail-fallback-trace.err.exp
diff --git a/tests/functional2/lang/attr-name-type/eval-fail.err.exp b/tests/functional2/lang/attrs/eval-fail-invalid-attrname-type.err.exp
similarity index 100%
rename from tests/functional2/lang/attr-name-type/eval-fail.err.exp
rename to tests/functional2/lang/attrs/eval-fail-invalid-attrname-type.err.exp
diff --git a/tests/functional/lang/eval-okay-attrs.exp b/tests/functional2/lang/attrs/eval-okay-2.out.exp
similarity index 100%
rename from tests/functional/lang/eval-okay-attrs.exp
rename to tests/functional2/lang/attrs/eval-okay-2.out.exp
diff --git a/tests/functional/lang/eval-okay-attrs3.exp b/tests/functional2/lang/attrs/eval-okay-3.out.exp
similarity index 100%
rename from tests/functional/lang/eval-okay-attrs3.exp
rename to tests/functional2/lang/attrs/eval-okay-3.out.exp
diff --git a/tests/functional/lang/eval-okay-attrs4.exp b/tests/functional2/lang/attrs/eval-okay-4.out.exp
similarity index 100%
rename from tests/functional/lang/eval-okay-attrs4.exp
rename to tests/functional2/lang/attrs/eval-okay-4.out.exp
diff --git a/tests/functional/lang/eval-okay-attrs5.exp b/tests/functional2/lang/attrs/eval-okay-5.out.exp
similarity index 100%
rename from tests/functional/lang/eval-okay-attrs5.exp
rename to tests/functional2/lang/attrs/eval-okay-5.out.exp
diff --git a/tests/functional2/lang/null-dynamic-attrs/eval-okay.out.exp b/tests/functional2/lang/attrs/eval-okay-strings-as-attrs-names.out.exp
similarity index 100%
rename from tests/functional2/lang/null-dynamic-attrs/eval-okay.out.exp
rename to tests/functional2/lang/attrs/eval-okay-strings-as-attrs-names.out.exp
diff --git a/tests/functional/lang/eval-okay-attrs2.exp b/tests/functional2/lang/attrs/eval-okay.out.exp
similarity index 100%
rename from tests/functional/lang/eval-okay-attrs2.exp
rename to tests/functional2/lang/attrs/eval-okay.out.exp
diff --git a/tests/functional/lang/eval-okay-attrs2.nix b/tests/functional2/lang/attrs/in-2.nix
similarity index 100%
rename from tests/functional/lang/eval-okay-attrs2.nix
rename to tests/functional2/lang/attrs/in-2.nix
diff --git a/tests/functional/lang/eval-okay-attrs3.nix b/tests/functional2/lang/attrs/in-3.nix
similarity index 100%
rename from tests/functional/lang/eval-okay-attrs3.nix
rename to tests/functional2/lang/attrs/in-3.nix
diff --git a/tests/functional/lang/eval-okay-attrs4.nix b/tests/functional2/lang/attrs/in-4.nix
similarity index 100%
rename from tests/functional/lang/eval-okay-attrs4.nix
rename to tests/functional2/lang/attrs/in-4.nix
diff --git a/tests/functional/lang/eval-okay-attrs5.nix b/tests/functional2/lang/attrs/in-5.nix
similarity index 100%
rename from tests/functional/lang/eval-okay-attrs5.nix
rename to tests/functional2/lang/attrs/in-5.nix
diff --git a/tests/functional2/lang/dup-attrs/in-1.nix b/tests/functional2/lang/attrs/in-duplicate-1.nix
similarity index 100%
rename from tests/functional2/lang/dup-attrs/in-1.nix
rename to tests/functional2/lang/attrs/in-duplicate-1.nix
diff --git a/tests/functional2/lang/dup-attrs/in-2.nix b/tests/functional2/lang/attrs/in-duplicate-2.nix
similarity index 100%
rename from tests/functional2/lang/dup-attrs/in-2.nix
rename to tests/functional2/lang/attrs/in-duplicate-2.nix
diff --git a/tests/functional2/lang/dup-attrs/in-3.nix b/tests/functional2/lang/attrs/in-duplicate-3.nix
similarity index 100%
rename from tests/functional2/lang/dup-attrs/in-3.nix
rename to tests/functional2/lang/attrs/in-duplicate-3.nix
diff --git a/tests/functional2/lang/dup-attrs/in-4.nix b/tests/functional2/lang/attrs/in-duplicate-4.nix
similarity index 100%
rename from tests/functional2/lang/dup-attrs/in-4.nix
rename to tests/functional2/lang/attrs/in-duplicate-4.nix
diff --git a/tests/functional2/lang/dup-attrs/in-7.nix b/tests/functional2/lang/attrs/in-duplicate-7.nix
similarity index 100%
rename from tests/functional2/lang/dup-attrs/in-7.nix
rename to tests/functional2/lang/attrs/in-duplicate-7.nix
diff --git a/tests/functional2/lang/dup-attrs/in-deep.nix b/tests/functional2/lang/attrs/in-duplicate-deep.nix
similarity index 100%
rename from tests/functional2/lang/dup-attrs/in-deep.nix
rename to tests/functional2/lang/attrs/in-duplicate-deep.nix
diff --git a/tests/functional2/lang/dup-attrs/in-inherit.nix b/tests/functional2/lang/attrs/in-duplicate-inherit.nix
similarity index 100%
rename from tests/functional2/lang/dup-attrs/in-inherit.nix
rename to tests/functional2/lang/attrs/in-duplicate-inherit.nix
diff --git a/tests/functional2/lang/dup-attrs/in.nix b/tests/functional2/lang/attrs/in-duplicate.nix
similarity index 100%
rename from tests/functional2/lang/dup-attrs/in.nix
rename to tests/functional2/lang/attrs/in-duplicate.nix
diff --git a/tests/functional2/lang/attr-fallback-trace/in.nix b/tests/functional2/lang/attrs/in-fallback-trace.nix
similarity index 100%
rename from tests/functional2/lang/attr-fallback-trace/in.nix
rename to tests/functional2/lang/attrs/in-fallback-trace.nix
diff --git a/tests/functional2/lang/attr-name-type/in.nix b/tests/functional2/lang/attrs/in-invalid-attrname-type.nix
similarity index 100%
rename from tests/functional2/lang/attr-name-type/in.nix
rename to tests/functional2/lang/attrs/in-invalid-attrname-type.nix
diff --git a/tests/functional/lang/eval-okay-strings-as-attrs-names.nix b/tests/functional2/lang/attrs/in-strings-as-attrs-names.nix
similarity index 100%
rename from tests/functional/lang/eval-okay-strings-as-attrs-names.nix
rename to tests/functional2/lang/attrs/in-strings-as-attrs-names.nix
diff --git a/tests/functional/lang/eval-okay-attrs.nix b/tests/functional2/lang/attrs/in.nix
similarity index 100%
rename from tests/functional/lang/eval-okay-attrs.nix
rename to tests/functional2/lang/attrs/in.nix
diff --git a/tests/functional2/lang/dup-attrs/parse-fail-1.err.exp b/tests/functional2/lang/attrs/parse-fail-duplicate-1.err.exp
similarity index 100%
rename from tests/functional2/lang/dup-attrs/parse-fail-1.err.exp
rename to tests/functional2/lang/attrs/parse-fail-duplicate-1.err.exp
diff --git a/tests/functional2/lang/dup-attrs/parse-fail-2.err.exp b/tests/functional2/lang/attrs/parse-fail-duplicate-2.err.exp
similarity index 100%
rename from tests/functional2/lang/dup-attrs/parse-fail-2.err.exp
rename to tests/functional2/lang/attrs/parse-fail-duplicate-2.err.exp
diff --git a/tests/functional2/lang/dup-attrs/parse-fail-3.err.exp b/tests/functional2/lang/attrs/parse-fail-duplicate-3.err.exp
similarity index 100%
rename from tests/functional2/lang/dup-attrs/parse-fail-3.err.exp
rename to tests/functional2/lang/attrs/parse-fail-duplicate-3.err.exp
diff --git a/tests/functional2/lang/dup-attrs/parse-fail-4.err.exp b/tests/functional2/lang/attrs/parse-fail-duplicate-4.err.exp
similarity index 100%
rename from tests/functional2/lang/dup-attrs/parse-fail-4.err.exp
rename to tests/functional2/lang/attrs/parse-fail-duplicate-4.err.exp
diff --git a/tests/functional2/lang/dup-attrs/parse-fail-7.err.exp b/tests/functional2/lang/attrs/parse-fail-duplicate-7.err.exp
similarity index 100%
rename from tests/functional2/lang/dup-attrs/parse-fail-7.err.exp
rename to tests/functional2/lang/attrs/parse-fail-duplicate-7.err.exp
diff --git a/tests/functional2/lang/function-autoargs/in.nix b/tests/functional2/lang/function-autoargs/in.nix
index ff1218527..79d54e96b 100644
--- a/tests/functional2/lang/function-autoargs/in.nix
+++ b/tests/functional2/lang/function-autoargs/in.nix
@@ -12,4 +12,5 @@ in
 
 {
   result = lib.id (builtins.concatStringsSep "" [xyzzy xyzzy2 fb]);
+  result2 = { xyzzy }: xyzzy;
 }
diff --git a/tests/functional2/lang/dup-attrs/in-5.nix b/tests/functional2/lang/parser-merge-attrs/in-4.nix
similarity index 100%
rename from tests/functional2/lang/dup-attrs/in-5.nix
rename to tests/functional2/lang/parser-merge-attrs/in-4.nix
diff --git a/tests/functional2/lang/dup-attrs/in-6.nix b/tests/functional2/lang/parser-merge-attrs/in-5.nix
similarity index 100%
rename from tests/functional2/lang/dup-attrs/in-6.nix
rename to tests/functional2/lang/parser-merge-attrs/in-5.nix
diff --git a/tests/functional2/lang/dup-attrs/parse-okay-5.out.exp b/tests/functional2/lang/parser-merge-attrs/parse-okay-4.out.exp
similarity index 100%
rename from tests/functional2/lang/dup-attrs/parse-okay-5.out.exp
rename to tests/functional2/lang/parser-merge-attrs/parse-okay-4.out.exp
diff --git a/tests/functional2/lang/dup-attrs/parse-okay-6.out.exp b/tests/functional2/lang/parser-merge-attrs/parse-okay-5.out.exp
similarity index 100%
rename from tests/functional2/lang/dup-attrs/parse-okay-6.out.exp
rename to tests/functional2/lang/parser-merge-attrs/parse-okay-5.out.exp