Refactor metaclass logic a bit, ensure lambdas are excluded

python/ql/test/query-tests/Functions/methodArgNames/parameter_names.py

@@ -141,3 +141,10 @@ class SpecialMethodNames(object):
 
     def __class_getitem__(cls):
         pass
+
+from dataclasses import dataclass, field
+
+@dataclass 
+class A:
+    # Lambdas used in initilisation aren't methods.
+    x: int = field(default_factory = lambda: 2)

python/ql/test/query-tests/Functions/methodArgNames/test.ql

@@ -14,7 +14,7 @@ module MethodArgTest implements TestSig {
         firstArgShouldBeNamedSelfAndIsnt(f) and
         tag = "shouldBeSelf"
         or
-        firstArgShouldBeNamedClsAndIsnt(f) and
+        firstArgShouldReferToClsAndDoesnt(f) and
         tag = "shouldBeCls"
       )
     )