From 976361d78ed6cd95ba115506c2165ed4a1ee97ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20Noord?=
 <13665637+DanielNoord@users.noreply.github.com>
Date: Sat, 12 Mar 2022 15:43:51 +0100
Subject: [PATCH 1/4] Use ``node.position`` in ``add_message`` if available

---
 ChangeLog                           |  6 ++++++
 doc/whatsnew/2.13.rst               |  6 ++++++
 pylint/lint/pylinter.py             | 26 ++++++++++++++++++--------
 pylint/testutils/unittest_linter.py | 26 ++++++++++++++++++--------
 4 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4f564286a3..3842f70e16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,12 @@ Release date: TBA
 
   Closes #5840
 
+* Updated the position of messages for class and function defintions to no longer cover
+  the complete definition. Only the ``def`` or ``class`` + the name of the class/function
+  are covered.
+
+  Closes #5466
+
 * ``using-f-string-in-unsupported-version`` and ``using-final-decorator-in-unsupported-version`` msgids
     were renamed from ``W1601`` and ``W1602`` to ``W2601`` and ``W2602``. Disabling using these msgids will break.
     This is done in order to restore consistency with the already existing msgids for ``apply-builtin`` and
diff --git a/doc/whatsnew/2.13.rst b/doc/whatsnew/2.13.rst
index 837a7ff330..911469c8d4 100644
--- a/doc/whatsnew/2.13.rst
+++ b/doc/whatsnew/2.13.rst
@@ -127,6 +127,12 @@ Other Changes
 
   Closes #352
 
+* Updated the position of messages for class and function defintions to no longer cover
+  the complete definition. Only the ``def`` or ``class`` + the name of the class/function
+  are covered.
+
+  Closes #5466
+
 * Reinstated checks from the python3 checker that are still useful for python 3
   (``eq-without-hash``). This is now in the ``pylint.extensions.eq_without_hash`` optional
   extension.
diff --git a/pylint/lint/pylinter.py b/pylint/lint/pylinter.py
index 2f5389d613..9f94da292d 100644
--- a/pylint/lint/pylinter.py
+++ b/pylint/lint/pylinter.py
@@ -1526,14 +1526,24 @@ def _add_one_message(
 
         # Look up "location" data of node if not yet supplied
         if node:
-            if not line:
-                line = node.fromlineno
-            if not col_offset:
-                col_offset = node.col_offset
-            if not end_lineno:
-                end_lineno = node.end_lineno
-            if not end_col_offset:
-                end_col_offset = node.end_col_offset
+            if node.position:
+                if not line:
+                    line = node.position.lineno
+                if not col_offset:
+                    col_offset = node.position.col_offset
+                if not end_lineno:
+                    end_lineno = node.position.end_lineno
+                if not end_col_offset:
+                    end_col_offset = node.position.end_col_offset
+            else:
+                if not line:
+                    line = node.fromlineno
+                if not col_offset:
+                    col_offset = node.col_offset
+                if not end_lineno:
+                    end_lineno = node.end_lineno
+                if not end_col_offset:
+                    end_col_offset = node.end_col_offset
 
         # should this message be displayed
         if not self.is_message_enabled(message_definition.msgid, line, confidence):
diff --git a/pylint/testutils/unittest_linter.py b/pylint/testutils/unittest_linter.py
index c9945f52fb..37d430fd2b 100644
--- a/pylint/testutils/unittest_linter.py
+++ b/pylint/testutils/unittest_linter.py
@@ -46,14 +46,24 @@ def add_message(
 
         # Look up "location" data of node if not yet supplied
         if node:
-            if not line:
-                line = node.fromlineno
-            if not col_offset:
-                col_offset = node.col_offset
-            if not end_lineno:
-                end_lineno = node.end_lineno
-            if not end_col_offset:
-                end_col_offset = node.end_col_offset
+            if node.position:
+                if not line:
+                    line = node.position.lineno
+                if not col_offset:
+                    col_offset = node.position.col_offset
+                if not end_lineno:
+                    end_lineno = node.position.end_lineno
+                if not end_col_offset:
+                    end_col_offset = node.position.end_col_offset
+            else:
+                if not line:
+                    line = node.fromlineno
+                if not col_offset:
+                    col_offset = node.col_offset
+                if not end_lineno:
+                    end_lineno = node.end_lineno
+                if not end_col_offset:
+                    end_col_offset = node.end_col_offset
 
         self._messages.append(
             MessageTest(

From 1f7e5ae58e8ad604898e4b94d4d31c345b6728a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20Noord?=
 <13665637+DanielNoord@users.noreply.github.com>
Date: Sat, 12 Mar 2022 15:47:46 +0100
Subject: [PATCH 2/4] Update tests

---
 .../a/abstract/abstract_abc_methods.txt       |  0
 .../abstract_class_instantiated_in_class.txt  |  0
 .../functional/a/abstract/abstract_method.txt | 32 ++++-----
 .../access_attr_before_def_false_positive.txt |  0
 .../access_to_protected_members_typing.txt    |  0
 .../alternative/alternative_union_syntax.txt  |  0
 tests/functional/a/arguments_differ.txt       | 24 +++----
 .../a/arguments_differ_issue5371.txt          |  0
 tests/functional/a/arguments_renamed.txt      | 22 +++---
 .../assignment_from_no_return_py3.txt         |  0
 tests/functional/a/async_functions.txt        | 14 ++--
 .../b/bad_reversed_sequence_py38.txt          |  0
 .../b/bad_staticmethod_argument.txt           |  4 +-
 tests/functional/b/base_init_vars.txt         |  0
 tests/functional/b/blacklisted_name.txt       |  2 +-
 .../b/bugfix_local_scope_metaclass_1177.txt   |  0
 tests/functional/b/builtin_module_test.txt    |  0
 tests/functional/c/cached_property.txt        |  2 +-
 tests/functional/c/class_attributes.txt       |  0
 tests/functional/c/class_members.txt          |  0
 .../functional/c/class_protocol_ellipsis.txt  |  0
 ...class_variable_slots_conflict_exempted.txt |  0
 .../c/classes_meth_could_be_a_function.txt    |  0
 .../c/classes_protected_member_access.txt     |  0
 ...parison_with_callable_typing_constants.txt |  0
 .../consider_using_sys_exit_exempted.txt      |  0
 .../consider_using_sys_exit_local_scope.txt   |  0
 tests/functional/c/control_pragmas.txt        |  0
 .../c/crash_missing_module_type.txt           |  0
 .../functional/d/dangerous_default_value.txt  | 44 ++++++------
 tests/functional/d/dataclass_typecheck.txt    |  2 +-
 tests/functional/d/decorator_scope.txt        |  0
 tests/functional/d/decorator_unused.txt       |  0
 .../d/defined_and_used_on_same_line.txt       |  0
 .../deprecated_method_suppression.txt         |  0
 .../d/disable_msg_github_issue_1389.txt       |  0
 tests/functional/d/disable_msg_next_line.txt  |  2 +-
 .../d/disable_wrong_import_position.txt       |  0
 .../d/disabled_msgid_in_pylintrc.txt          |  0
 tests/functional/d/docstrings.txt             | 14 ++--
 tests/functional/d/dotted_ancestor.txt        |  2 +-
 tests/functional/d/duplicate_bases.txt        |  2 +-
 tests/functional/e/.#emacs_file_lock.txt      |  0
 .../e/.#emacs_file_lock_by_conf.txt           |  0
 .../e/e1101_9588_base_attr_aug_assign.txt     |  0
 tests/functional/e/enum_subclasses.txt        |  0
 .../e/external_classmethod_crash.txt          |  0
 .../ext/code_style/cs_py_version_35.txt       |  0
 tests/functional/ext/docparams/docparams.txt  | 24 +++----
 .../ext/docparams/missing_param_doc.txt       | 36 +++++-----
 .../docparams/parameter/missing_param_doc.txt |  0
 .../parameter/missing_param_doc_required.txt  |  6 +-
 .../missing_param_doc_required_Google.txt     | 52 +++++++-------
 .../missing_param_doc_required_Numpy.txt      | 44 ++++++------
 .../missing_param_doc_required_Sphinx.txt     | 70 +++++++++----------
 .../missing_param_doc_required_min_length.txt |  0
 ...ram_doc_required_no_doc_rgx_check_init.txt |  2 +-
 ...ram_doc_required_no_doc_rgx_check_none.txt |  0
 ..._param_doc_required_no_doc_rgx_default.txt |  0
 ...param_doc_required_no_doc_rgx_test_all.txt |  2 +-
 .../docparams/raise/missing_raises_doc.txt    |  2 +-
 .../raise/missing_raises_doc_Google.txt       | 12 ++--
 .../raise/missing_raises_doc_Numpy.txt        | 12 ++--
 .../raise/missing_raises_doc_Sphinx.txt       | 12 ++--
 .../raise/missing_raises_doc_required.txt     |  2 +-
 .../missing_raises_doc_required_Google.txt    |  0
 .../missing_raises_doc_required_Numpy.txt     |  0
 .../missing_raises_doc_required_Sphinx.txt    |  0
 ...ng_raises_doc_required_exc_inheritance.txt |  2 +-
 .../docparams/return/missing_return_doc.txt   |  0
 .../return/missing_return_doc_Google.txt      | 10 +--
 .../return/missing_return_doc_Numpy.txt       | 10 +--
 .../return/missing_return_doc_Sphinx.txt      |  4 +-
 .../return/missing_return_doc_required.txt    |  4 +-
 .../missing_return_doc_required_Google.txt    | 16 ++---
 .../missing_return_doc_required_Numpy.txt     | 16 ++---
 .../missing_return_doc_required_Sphinx.txt    | 16 ++---
 .../ext/docparams/useless_type_doc.txt        |  8 +--
 .../ext/docparams/yield/missing_yield_doc.txt |  0
 .../yield/missing_yield_doc_Google.txt        |  2 +-
 .../yield/missing_yield_doc_Numpy.txt         |  2 +-
 .../yield/missing_yield_doc_Sphinx.txt        |  0
 .../yield/missing_yield_doc_required.txt      |  4 +-
 .../missing_yield_doc_required_Google.txt     | 10 +--
 .../missing_yield_doc_required_Numpy.txt      |  6 +-
 .../missing_yield_doc_required_Sphinx.txt     | 10 +--
 .../docstyle/docstyle_first_line_empty.txt    |  6 +-
 .../ext/docstyle/docstyle_quotes_py38.txt     |  8 +--
 .../ext/eq_without_hash/eq_without_hash.txt   |  2 +-
 tests/functional/ext/mccabe/mccabe.txt        | 28 ++++----
 ...yping_broken_callable_deprecated_alias.txt |  0
 .../typing/typing_broken_noreturn_py372.txt   |  0
 .../functional/f/fallback_import_disabled.txt |  0
 tests/functional/f/first_arg.txt              | 10 +--
 .../f/formatted_string_literal_with_if.txt    |  0
 tests/functional/f/function_redefined.txt     | 12 ++--
 .../functional/f/function_redefined_2540.txt  |  0
 tests/functional/f/future_import.txt          |  0
 .../generic_alias_collections.txt             | 22 +++---
 .../generic_alias_mixed_py39.txt              | 10 +--
 .../g/generic_alias/generic_alias_related.txt |  2 +-
 .../generic_alias_related_py39.txt            |  2 +-
 .../generic_alias_side_effects.txt            | 16 ++---
 .../g/generic_alias/generic_alias_typing.txt  | 24 +++----
 tests/functional/g/genexp_in_class_scope.txt  |  0
 .../i/implicit/implicit_str_concat_utf8.txt   |  0
 .../i/inconsistent/inconsistent_mro.txt       |  2 +-
 .../i/inconsistent/inconsistent_returns.txt   | 34 ++++-----
 .../inconsistent_returns_noreturn.txt         |  2 +-
 tests/functional/i/inherit_non_class.txt      | 20 +++---
 tests/functional/i/init_is_generator.txt      |  2 +-
 tests/functional/i/init_not_called.txt        |  4 +-
 .../i/init_return_from_inner_function.txt     |  0
 .../i/init_subclass_classmethod.txt           |  0
 tests/functional/i/inner_classes.txt          |  0
 .../i/invalid/invalid_all_format_valid_1.txt  |  0
 .../i/invalid/invalid_all_format_valid_2.txt  |  0
 .../i/invalid/invalid_all_format_valid_3.txt  |  0
 .../i/invalid/invalid_all_format_valid_4.txt  |  0
 .../i/invalid/invalid_all_format_valid_5.txt  |  0
 .../i/invalid/invalid_all_format_valid_6.txt  |  0
 .../i/invalid/invalid_bool_returned.txt       |  6 +-
 .../i/invalid/invalid_bytes_returned.txt      |  6 +-
 .../i/invalid/invalid_format_returned.txt     |  6 +-
 .../invalid_getnewargs_ex_returned.txt        | 12 ++--
 .../invalid_getnewargs_returned.txt           |  6 +-
 .../i/invalid/invalid_hash_returned.txt       |  8 +--
 .../i/invalid/invalid_index_returned.txt      |  8 +--
 .../invalid_length_hint_returned.txt          |  6 +-
 .../invalid_length_returned.txt               |  8 +--
 .../i/invalid/invalid_metaclass.txt           | 12 ++--
 .../i/invalid/invalid_metaclass_py3.txt       |  0
 tests/functional/i/invalid/invalid_name.txt   |  4 +-
 .../invalid_name_module_level.txt             |  2 +-
 .../invalid_name_multinaming_style.txt        |  2 +-
 .../invalid_name/invalid_name_property.txt    |  4 +-
 .../i/invalid/invalid_overridden_method.txt   | 12 ++--
 .../i/invalid/invalid_repr_returned.txt       |  6 +-
 .../i/invalid/invalid_str_returned.txt        |  6 +-
 .../k/keyword_arg_before_vararg.txt           |  8 +--
 .../functional/l/lambda_use_before_assign.txt |  0
 .../l/line_too_long_end_of_module.txt         |  0
 .../l/logging_format_interpolation_style.txt  |  0
 tests/functional/l/long_utf8_lines.txt        |  0
 .../member_checks_inference_improvements.txt  |  0
 tests/functional/m/metaclass_attr_access.txt  |  0
 tests/functional/m/method_hidden.txt          |  6 +-
 .../m/missing/missing_class_docstring.txt     |  2 +-
 .../m/missing/missing_docstring.txt           |  4 +-
 .../m/missing/missing_docstring_new_style.txt |  8 +--
 .../m/missing/missing_function_docstring.txt  |  4 +-
 .../missing_function_docstring_min_length.txt |  4 +-
 .../missing_function_docstring_rgx.txt        |  2 +-
 .../missing_module_docstring_disabled.txt     |  0
 .../missing_module_docstring_empty.txt        |  0
 .../m/missing/missing_self_argument.txt       |  4 +-
 tests/functional/m/monkeypatch_method.txt     |  0
 .../n/name/name_good_bad_names_regex.txt      |  2 +-
 .../n/name/name_preset_snake_case.txt         |  8 +--
 tests/functional/n/name/name_styles.txt       | 14 ++--
 tests/functional/n/namePresetCamelCase.txt    |  4 +-
 tests/functional/n/no/no_member.txt           |  0
 .../n/no/no_member_nested_namedtuple.txt      |  0
 .../n/no/no_member_subclassed_dataclasses.txt |  0
 .../n/no/no_method_argument_py38.txt          |  0
 tests/functional/n/no/no_self_argument.txt    |  4 +-
 .../functional/n/no/no_self_argument_py37.txt |  2 +-
 tests/functional/n/no/no_self_use.txt         |  4 +-
 tests/functional/n/no/no_self_use_py3.txt     |  0
 .../functional/n/no/no_warning_docstring.txt  |  0
 tests/functional/n/non/non_ascii_name.txt     |  2 +-
 .../non/non_ascii_name_backward_test_code.txt |  0
 .../non/non_ascii_name_backward_test_msg.txt  |  0
 .../n/non/non_init_parent_called.txt          |  2 +-
 .../n/non/non_iterator_returned.txt           |  8 +--
 .../n/non/non_parent_init_called.txt          |  0
 .../n/non_ascii_import/non_ascii_import.txt   |  0
 .../non_ascii_import_as_okay.txt              |  0
 .../non_ascii_name_dict_kwargs.txt            |  0
 .../non_ascii_name_function.txt               |  2 +-
 .../non_ascii_name_staticmethod.txt           |  2 +-
 .../non_ascii_name_class.txt                  |  2 +-
 .../non_ascii_name_class_method.txt           |  2 +-
 tests/functional/n/nonlocal_and_global.txt    |  2 +-
 .../n/not_async_context_manager_py37.txt      |  0
 .../o/object_as_class_attribute.txt           |  0
 tests/functional/o/old_division_floats.txt    |  0
 tests/functional/o/old_division_manually.txt  |  0
 tests/functional/o/overloaded_operator.txt    |  0
 .../o/overridden_final_method_py38.txt        |  4 +-
 tests/functional/p/pattern_matching.txt       |  0
 .../p/postponed_evaluation_activated.txt      |  0
 ...tponed_evaluation_activated_with_alias.txt |  0
 tests/functional/p/pragma_after_backslash.txt |  0
 .../p/property_affectation_py26.txt           |  0
 .../functional/p/property_with_parameters.txt |  2 +-
 tests/functional/p/protocol_classes.txt       |  4 +-
 tests/functional/p/py_version_35.txt          |  0
 tests/functional/r/raising/raising_self.txt   |  0
 .../r/recursion/recursion_error_2667.txt      |  0
 .../r/recursion/recursion_error_2836.txt      |  0
 .../r/recursion/recursion_error_2861.txt      |  0
 .../r/recursion/recursion_error_2899.txt      |  0
 .../r/recursion/recursion_error_2906.txt      |  0
 .../r/recursion/recursion_error_3152.txt      |  0
 .../r/recursion/recursion_error_3159.txt      |  0
 .../r/recursion/recursion_error_940.txt       |  0
 .../r/recursion/recursion_error_crash.txt     |  0
 .../recursion/recursion_error_crash_2683.txt  |  0
 .../recursion_error_crash_astroid_623.txt     |  0
 .../r/recursion/recursion_regression_2960.txt |  0
 .../redefined_outer_name_type_checking.txt    |  0
 .../regression_1326_crash_uninferable.txt     |  0
 .../regression/regression_2306_enum_value.txt |  0
 .../regression_2443_duplicate_bases.txt       |  0
 .../r/regression/regression_2913.txt          |  0
 .../r/regression/regression_2937_ifexp.txt    |  0
 .../r/regression/regression_3091.txt          |  0
 .../regression_3231_no_member_property.txt    |  0
 ...egression_3507_typing_alias_isinstance.txt |  0
 .../regression_3535_double_enum_inherit.txt   |  0
 ...egression_3595_notcallable_collections.txt |  0
 .../regression_4221_object_instanceattr.txt   |  0
 .../regression_4358_unsubscriptable_enum.txt  |  0
 .../regression_4612_crash_pytest_fixture.txt  |  0
 .../r/regression/regression_4680.txt          |  2 +-
 .../r/regression/regression_4723.txt          |  2 +-
 .../r/regression/regression_4891.txt          |  0
 .../r/regression/regression_issue_4631.txt    |  0
 .../r/regression/regression_issue_4633.txt    |  0
 .../regression/regression_no_member_1078.txt  |  0
 .../regression_no_value_for_parameter.txt     |  0
 .../r/regression/regression_posonly_args.txt  |  0
 .../regression_property_no_member_2641.txt    |  0
 .../regression_property_no_member_3269.txt    |  0
 .../regression_property_no_member_844.txt     |  0
 .../regression_property_no_member_870.txt     |  0
 .../regression_property_slots_2439.txt        |  0
 .../r/regression_02/regression_4982.txt       |  0
 .../r/regression_02/regression_5030.txt       |  0
 .../r/regression_02/regression_5048.txt       |  0
 .../r/regression_02/regression_5244.txt       |  0
 .../r/regression_02/regression_5461.txt       |  0
 .../regression_node_statement.txt             |  0
 .../regression_node_statement_two.txt         |  0
 .../regression_too_many_arguments_2335.txt    |  0
 tests/functional/r/return_in_init.txt         |  2 +-
 tests/functional/s/signature_differs.txt      |  2 +-
 .../functional/s/singledispatch_functions.txt |  2 +-
 tests/functional/s/slots_checks.txt           | 12 ++--
 tests/functional/s/socketerror_import.txt     |  0
 .../string_formatting_failed_inference.txt    |  0
 ...tring_formatting_failed_inference_py35.txt |  0
 .../s/subclassed_final_class_py38.txt         |  2 +-
 .../s/super/super_init_not_called.txt         |  2 +-
 ...super_init_not_called_extensions_py310.txt |  2 +-
 .../s/super/super_init_not_called_py38.txt    |  0
 .../s/symlink/_binding/symlink_module.txt     |  0
 .../symlink/symlink_module/symlink_module.txt |  0
 tests/functional/t/test_compile.txt           |  0
 .../t/too/too_few_public_methods.txt          |  2 +-
 .../t/too/too_few_public_methods_37.txt       |  0
 .../t/too/too_few_public_methods_excluded.txt |  2 +-
 tests/functional/t/too/too_many_ancestors.txt |  4 +-
 .../too_many_ancestors_ignored_parents.txt    |  2 +-
 tests/functional/t/too/too_many_arguments.txt |  2 +-
 .../t/too/too_many_arguments_issue_1045.txt   |  0
 .../t/too/too_many_arguments_overload.txt     |  0
 tests/functional/t/too/too_many_branches.txt  |  2 +-
 .../t/too/too_many_function_args.txt          |  0
 .../t/too/too_many_instance_attributes.txt    |  2 +-
 .../too/too_many_instance_attributes_py37.txt |  0
 .../t/too/too_many_lines_disabled.txt         |  0
 tests/functional/t/too/too_many_locals.txt    |  6 +-
 .../t/too/too_many_public_methods.txt         |  2 +-
 .../t/too/too_many_return_statements.txt      |  2 +-
 .../functional/t/too/too_many_statements.txt  |  6 +-
 tests/functional/t/typedDict.txt              |  0
 tests/functional/t/typing_generic.txt         |  0
 tests/functional/t/typing_use.txt             |  2 +-
 .../u/unbalanced_tuple_unpacking_py30.txt     |  0
 .../undefined/undefined_variable_classes.txt  |  0
 .../undefined_variable_crash_on_attribute.txt |  0
 .../undefined_variable_decorators.txt         |  0
 .../u/undefined/undefined_variable_py30.txt   |  6 +-
 .../u/undefined/undefined_variable_typing.txt |  0
 .../u/unexpected_special_method_signature.txt | 32 ++++-----
 .../u/ungrouped_imports_isort_compatible.txt  |  0
 tests/functional/u/uninferable_all_object.txt |  0
 tests/functional/u/unpacking/unpacking.txt    |  0
 .../unpacking/unpacking_non_sequence_py37.txt |  0
 tests/functional/u/unsubscriptable_object.txt |  0
 .../u/unused/unused_global_variable1.txt      |  0
 .../u/unused/unused_global_variable3.txt      |  0
 .../u/unused/unused_import_assigned_to.txt    |  0
 .../unused_import_class_def_keyword.txt       |  0
 .../unused_import_everything_disabled.txt     |  0
 .../unused_import_positional_only_py38.txt    |  0
 tests/functional/u/unused/unused_module.txt   |  0
 .../u/unused/unused_private_member.txt        | 20 +++---
 .../u/unused/unused_typing_imports.txt        |  0
 .../u/unused/unused_variable_py36.txt         |  0
 .../u/unused/unused_variable_py38.txt         |  8 +--
 .../u/use/use_symbolic_message_instead.txt    |  4 +-
 ...xcept_handler_for_try_with_return_py38.txt |  0
 .../u/used/used_before_assignment_488.txt     |  0
 ...fore_assignment_filtered_comprehension.txt |  0
 .../used/used_before_assignment_issue853.txt  |  0
 .../u/useless/useless_object_inheritance.txt  |  8 +--
 tests/functional/u/useless/useless_return.txt |  4 +-
 .../u/useless/useless_super_delegation.txt    | 38 +++++-----
 .../useless/useless_super_delegation_py3.txt  |  4 +-
 .../useless/useless_super_delegation_py35.txt |  2 +-
 .../useless/useless_super_delegation_py38.txt |  2 +-
 .../u/useless/useless_suppression.txt         |  0
 tests/functional/w/wrong_import_order2.txt    |  0
 .../functional/w/wrong_import_position10.txt  |  0
 .../functional/w/wrong_import_position15.txt  |  0
 tests/functional/w/wrong_import_position2.txt |  0
 tests/functional/w/wrong_import_position3.txt |  0
 tests/functional/w/wrong_import_position4.txt |  0
 tests/functional/w/wrong_import_position5.txt |  0
 tests/functional/w/wrong_import_position6.txt |  0
 tests/functional/w/wrong_import_position7.txt |  0
 tests/functional/w/wrong_import_position8.txt |  0
 tests/functional/w/wrong_import_position9.txt |  0
 ...ng_import_position_exclude_dunder_main.txt |  0
 tests/functional/y/yield_assign.txt           |  0
 tests/functional/y/yield_return_mix.txt       |  0
 329 files changed, 592 insertions(+), 592 deletions(-)
 create mode 100644 tests/functional/a/abstract/abstract_abc_methods.txt
 create mode 100644 tests/functional/a/abstract/abstract_class_instantiated_in_class.txt
 create mode 100644 tests/functional/a/access/access_attr_before_def_false_positive.txt
 create mode 100644 tests/functional/a/access/access_to_protected_members_typing.txt
 create mode 100644 tests/functional/a/alternative/alternative_union_syntax.txt
 create mode 100644 tests/functional/a/arguments_differ_issue5371.txt
 create mode 100644 tests/functional/a/assignment/assignment_from_no_return_py3.txt
 create mode 100644 tests/functional/b/bad_reversed_sequence_py38.txt
 create mode 100644 tests/functional/b/base_init_vars.txt
 create mode 100644 tests/functional/b/bugfix_local_scope_metaclass_1177.txt
 create mode 100644 tests/functional/b/builtin_module_test.txt
 create mode 100644 tests/functional/c/class_attributes.txt
 create mode 100644 tests/functional/c/class_members.txt
 create mode 100644 tests/functional/c/class_protocol_ellipsis.txt
 create mode 100644 tests/functional/c/class_variable_slots_conflict_exempted.txt
 create mode 100644 tests/functional/c/classes_meth_could_be_a_function.txt
 create mode 100644 tests/functional/c/classes_protected_member_access.txt
 create mode 100644 tests/functional/c/comparison_with_callable_typing_constants.txt
 create mode 100644 tests/functional/c/consider/consider_using_sys_exit_exempted.txt
 create mode 100644 tests/functional/c/consider/consider_using_sys_exit_local_scope.txt
 create mode 100644 tests/functional/c/control_pragmas.txt
 create mode 100644 tests/functional/c/crash_missing_module_type.txt
 create mode 100644 tests/functional/d/decorator_scope.txt
 create mode 100644 tests/functional/d/decorator_unused.txt
 create mode 100644 tests/functional/d/defined_and_used_on_same_line.txt
 create mode 100644 tests/functional/d/deprecated/deprecated_method_suppression.txt
 create mode 100644 tests/functional/d/disable_msg_github_issue_1389.txt
 create mode 100644 tests/functional/d/disable_wrong_import_position.txt
 create mode 100644 tests/functional/d/disabled_msgid_in_pylintrc.txt
 create mode 100644 tests/functional/e/.#emacs_file_lock.txt
 create mode 100644 tests/functional/e/.#emacs_file_lock_by_conf.txt
 create mode 100644 tests/functional/e/e1101_9588_base_attr_aug_assign.txt
 create mode 100644 tests/functional/e/enum_subclasses.txt
 create mode 100644 tests/functional/e/external_classmethod_crash.txt
 create mode 100644 tests/functional/ext/code_style/cs_py_version_35.txt
 create mode 100644 tests/functional/ext/docparams/parameter/missing_param_doc.txt
 create mode 100644 tests/functional/ext/docparams/parameter/missing_param_doc_required_min_length.txt
 create mode 100644 tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_check_none.txt
 create mode 100644 tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_default.txt
 create mode 100644 tests/functional/ext/docparams/raise/missing_raises_doc_required_Google.txt
 create mode 100644 tests/functional/ext/docparams/raise/missing_raises_doc_required_Numpy.txt
 create mode 100644 tests/functional/ext/docparams/raise/missing_raises_doc_required_Sphinx.txt
 create mode 100644 tests/functional/ext/docparams/return/missing_return_doc.txt
 create mode 100644 tests/functional/ext/docparams/yield/missing_yield_doc.txt
 create mode 100644 tests/functional/ext/docparams/yield/missing_yield_doc_Sphinx.txt
 create mode 100644 tests/functional/ext/typing/typing_broken_callable_deprecated_alias.txt
 create mode 100644 tests/functional/ext/typing/typing_broken_noreturn_py372.txt
 create mode 100644 tests/functional/f/fallback_import_disabled.txt
 create mode 100644 tests/functional/f/formatted_string_literal_with_if.txt
 create mode 100644 tests/functional/f/function_redefined_2540.txt
 create mode 100644 tests/functional/f/future_import.txt
 create mode 100644 tests/functional/g/genexp_in_class_scope.txt
 create mode 100644 tests/functional/i/implicit/implicit_str_concat_utf8.txt
 create mode 100644 tests/functional/i/init_return_from_inner_function.txt
 create mode 100644 tests/functional/i/init_subclass_classmethod.txt
 create mode 100644 tests/functional/i/inner_classes.txt
 create mode 100644 tests/functional/i/invalid/invalid_all_format_valid_1.txt
 create mode 100644 tests/functional/i/invalid/invalid_all_format_valid_2.txt
 create mode 100644 tests/functional/i/invalid/invalid_all_format_valid_3.txt
 create mode 100644 tests/functional/i/invalid/invalid_all_format_valid_4.txt
 create mode 100644 tests/functional/i/invalid/invalid_all_format_valid_5.txt
 create mode 100644 tests/functional/i/invalid/invalid_all_format_valid_6.txt
 create mode 100644 tests/functional/i/invalid/invalid_metaclass_py3.txt
 create mode 100644 tests/functional/l/lambda_use_before_assign.txt
 create mode 100644 tests/functional/l/line_too_long_end_of_module.txt
 create mode 100644 tests/functional/l/logging_format_interpolation_style.txt
 create mode 100644 tests/functional/l/long_utf8_lines.txt
 create mode 100644 tests/functional/m/member/member_checks_inference_improvements.txt
 create mode 100644 tests/functional/m/metaclass_attr_access.txt
 create mode 100644 tests/functional/m/missing/missing_module_docstring_disabled.txt
 create mode 100644 tests/functional/m/missing/missing_module_docstring_empty.txt
 create mode 100644 tests/functional/m/monkeypatch_method.txt
 create mode 100644 tests/functional/n/no/no_member.txt
 create mode 100644 tests/functional/n/no/no_member_nested_namedtuple.txt
 create mode 100644 tests/functional/n/no/no_member_subclassed_dataclasses.txt
 create mode 100644 tests/functional/n/no/no_method_argument_py38.txt
 create mode 100644 tests/functional/n/no/no_self_use_py3.txt
 create mode 100644 tests/functional/n/no/no_warning_docstring.txt
 create mode 100644 tests/functional/n/non/non_ascii_name_backward_test_code.txt
 create mode 100644 tests/functional/n/non/non_ascii_name_backward_test_msg.txt
 create mode 100644 tests/functional/n/non/non_parent_init_called.txt
 create mode 100644 tests/functional/n/non_ascii_import/non_ascii_import.txt
 create mode 100644 tests/functional/n/non_ascii_import/non_ascii_import_as_okay.txt
 create mode 100644 tests/functional/n/non_ascii_name/non_ascii_name_dict_kwargs.txt
 create mode 100644 tests/functional/n/not_async_context_manager_py37.txt
 create mode 100644 tests/functional/o/object_as_class_attribute.txt
 create mode 100644 tests/functional/o/old_division_floats.txt
 create mode 100644 tests/functional/o/old_division_manually.txt
 create mode 100644 tests/functional/o/overloaded_operator.txt
 create mode 100644 tests/functional/p/pattern_matching.txt
 create mode 100644 tests/functional/p/postponed_evaluation_activated.txt
 create mode 100644 tests/functional/p/postponed_evaluation_activated_with_alias.txt
 create mode 100644 tests/functional/p/pragma_after_backslash.txt
 create mode 100644 tests/functional/p/property_affectation_py26.txt
 create mode 100644 tests/functional/p/py_version_35.txt
 create mode 100644 tests/functional/r/raising/raising_self.txt
 create mode 100644 tests/functional/r/recursion/recursion_error_2667.txt
 create mode 100644 tests/functional/r/recursion/recursion_error_2836.txt
 create mode 100644 tests/functional/r/recursion/recursion_error_2861.txt
 create mode 100644 tests/functional/r/recursion/recursion_error_2899.txt
 create mode 100644 tests/functional/r/recursion/recursion_error_2906.txt
 create mode 100644 tests/functional/r/recursion/recursion_error_3152.txt
 create mode 100644 tests/functional/r/recursion/recursion_error_3159.txt
 create mode 100644 tests/functional/r/recursion/recursion_error_940.txt
 create mode 100644 tests/functional/r/recursion/recursion_error_crash.txt
 create mode 100644 tests/functional/r/recursion/recursion_error_crash_2683.txt
 create mode 100644 tests/functional/r/recursion/recursion_error_crash_astroid_623.txt
 create mode 100644 tests/functional/r/recursion/recursion_regression_2960.txt
 create mode 100644 tests/functional/r/redefined/redefined_outer_name_type_checking.txt
 create mode 100644 tests/functional/r/regression/regression_1326_crash_uninferable.txt
 create mode 100644 tests/functional/r/regression/regression_2306_enum_value.txt
 create mode 100644 tests/functional/r/regression/regression_2443_duplicate_bases.txt
 create mode 100644 tests/functional/r/regression/regression_2913.txt
 create mode 100644 tests/functional/r/regression/regression_2937_ifexp.txt
 create mode 100644 tests/functional/r/regression/regression_3091.txt
 create mode 100644 tests/functional/r/regression/regression_3231_no_member_property.txt
 create mode 100644 tests/functional/r/regression/regression_3507_typing_alias_isinstance.txt
 create mode 100644 tests/functional/r/regression/regression_3535_double_enum_inherit.txt
 create mode 100644 tests/functional/r/regression/regression_3595_notcallable_collections.txt
 create mode 100644 tests/functional/r/regression/regression_4221_object_instanceattr.txt
 create mode 100644 tests/functional/r/regression/regression_4358_unsubscriptable_enum.txt
 create mode 100644 tests/functional/r/regression/regression_4612_crash_pytest_fixture.txt
 create mode 100644 tests/functional/r/regression/regression_4891.txt
 create mode 100644 tests/functional/r/regression/regression_issue_4631.txt
 create mode 100644 tests/functional/r/regression/regression_issue_4633.txt
 create mode 100644 tests/functional/r/regression/regression_no_member_1078.txt
 create mode 100644 tests/functional/r/regression/regression_no_value_for_parameter.txt
 create mode 100644 tests/functional/r/regression/regression_posonly_args.txt
 create mode 100644 tests/functional/r/regression/regression_property_no_member_2641.txt
 create mode 100644 tests/functional/r/regression/regression_property_no_member_3269.txt
 create mode 100644 tests/functional/r/regression/regression_property_no_member_844.txt
 create mode 100644 tests/functional/r/regression/regression_property_no_member_870.txt
 create mode 100644 tests/functional/r/regression/regression_property_slots_2439.txt
 create mode 100644 tests/functional/r/regression_02/regression_4982.txt
 create mode 100644 tests/functional/r/regression_02/regression_5030.txt
 create mode 100644 tests/functional/r/regression_02/regression_5048.txt
 create mode 100644 tests/functional/r/regression_02/regression_5244.txt
 create mode 100644 tests/functional/r/regression_02/regression_5461.txt
 create mode 100644 tests/functional/r/regression_02/regression_node_statement.txt
 create mode 100644 tests/functional/r/regression_02/regression_node_statement_two.txt
 create mode 100644 tests/functional/r/regression_02/regression_too_many_arguments_2335.txt
 create mode 100644 tests/functional/s/socketerror_import.txt
 create mode 100644 tests/functional/s/string/string_formatting_failed_inference.txt
 create mode 100644 tests/functional/s/string/string_formatting_failed_inference_py35.txt
 create mode 100644 tests/functional/s/super/super_init_not_called_py38.txt
 create mode 100644 tests/functional/s/symlink/_binding/symlink_module.txt
 create mode 100644 tests/functional/s/symlink/symlink_module/symlink_module.txt
 create mode 100644 tests/functional/t/test_compile.txt
 create mode 100644 tests/functional/t/too/too_few_public_methods_37.txt
 create mode 100644 tests/functional/t/too/too_many_arguments_issue_1045.txt
 create mode 100644 tests/functional/t/too/too_many_arguments_overload.txt
 create mode 100644 tests/functional/t/too/too_many_function_args.txt
 create mode 100644 tests/functional/t/too/too_many_instance_attributes_py37.txt
 create mode 100644 tests/functional/t/too/too_many_lines_disabled.txt
 create mode 100644 tests/functional/t/typedDict.txt
 create mode 100644 tests/functional/t/typing_generic.txt
 create mode 100644 tests/functional/u/unbalanced_tuple_unpacking_py30.txt
 create mode 100644 tests/functional/u/undefined/undefined_variable_classes.txt
 create mode 100644 tests/functional/u/undefined/undefined_variable_crash_on_attribute.txt
 create mode 100644 tests/functional/u/undefined/undefined_variable_decorators.txt
 create mode 100644 tests/functional/u/undefined/undefined_variable_typing.txt
 create mode 100644 tests/functional/u/ungrouped_imports_isort_compatible.txt
 create mode 100644 tests/functional/u/uninferable_all_object.txt
 create mode 100644 tests/functional/u/unpacking/unpacking.txt
 create mode 100644 tests/functional/u/unpacking/unpacking_non_sequence_py37.txt
 create mode 100644 tests/functional/u/unsubscriptable_object.txt
 create mode 100644 tests/functional/u/unused/unused_global_variable1.txt
 create mode 100644 tests/functional/u/unused/unused_global_variable3.txt
 create mode 100644 tests/functional/u/unused/unused_import_assigned_to.txt
 create mode 100644 tests/functional/u/unused/unused_import_class_def_keyword.txt
 create mode 100644 tests/functional/u/unused/unused_import_everything_disabled.txt
 create mode 100644 tests/functional/u/unused/unused_import_positional_only_py38.txt
 create mode 100644 tests/functional/u/unused/unused_module.txt
 create mode 100644 tests/functional/u/unused/unused_typing_imports.txt
 create mode 100644 tests/functional/u/unused/unused_variable_py36.txt
 create mode 100644 tests/functional/u/use/used_before_assignment_except_handler_for_try_with_return_py38.txt
 create mode 100644 tests/functional/u/used/used_before_assignment_488.txt
 create mode 100644 tests/functional/u/used/used_before_assignment_filtered_comprehension.txt
 create mode 100644 tests/functional/u/used/used_before_assignment_issue853.txt
 create mode 100644 tests/functional/u/useless/useless_suppression.txt
 create mode 100644 tests/functional/w/wrong_import_order2.txt
 create mode 100644 tests/functional/w/wrong_import_position10.txt
 create mode 100644 tests/functional/w/wrong_import_position15.txt
 create mode 100644 tests/functional/w/wrong_import_position2.txt
 create mode 100644 tests/functional/w/wrong_import_position3.txt
 create mode 100644 tests/functional/w/wrong_import_position4.txt
 create mode 100644 tests/functional/w/wrong_import_position5.txt
 create mode 100644 tests/functional/w/wrong_import_position6.txt
 create mode 100644 tests/functional/w/wrong_import_position7.txt
 create mode 100644 tests/functional/w/wrong_import_position8.txt
 create mode 100644 tests/functional/w/wrong_import_position9.txt
 create mode 100644 tests/functional/w/wrong_import_position_exclude_dunder_main.txt
 create mode 100644 tests/functional/y/yield_assign.txt
 create mode 100644 tests/functional/y/yield_return_mix.txt

diff --git a/tests/functional/a/abstract/abstract_abc_methods.txt b/tests/functional/a/abstract/abstract_abc_methods.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/a/abstract/abstract_class_instantiated_in_class.txt b/tests/functional/a/abstract/abstract_class_instantiated_in_class.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/a/abstract/abstract_method.txt b/tests/functional/a/abstract/abstract_method.txt
index 1eb47639c6..2b4ea9a2eb 100644
--- a/tests/functional/a/abstract/abstract_method.txt
+++ b/tests/functional/a/abstract/abstract_method.txt
@@ -1,16 +1,16 @@
-abstract-method:47:0:51:38:Concrete:Method 'bbbb' is abstract in class 'Abstract' but is not overridden:UNDEFINED
-abstract-method:70:0:72:12:Container:Method '__hash__' is abstract in class 'Structure' but is not overridden:UNDEFINED
-abstract-method:70:0:72:12:Container:Method '__iter__' is abstract in class 'Structure' but is not overridden:UNDEFINED
-abstract-method:70:0:72:12:Container:Method '__len__' is abstract in class 'Structure' but is not overridden:UNDEFINED
-abstract-method:76:0:78:17:Sizable:Method '__contains__' is abstract in class 'Structure' but is not overridden:UNDEFINED
-abstract-method:76:0:78:17:Sizable:Method '__hash__' is abstract in class 'Structure' but is not overridden:UNDEFINED
-abstract-method:76:0:78:17:Sizable:Method '__iter__' is abstract in class 'Structure' but is not overridden:UNDEFINED
-abstract-method:82:0:83:17:Hashable:Method '__contains__' is abstract in class 'Structure' but is not overridden:UNDEFINED
-abstract-method:82:0:83:17:Hashable:Method '__iter__' is abstract in class 'Structure' but is not overridden:UNDEFINED
-abstract-method:82:0:83:17:Hashable:Method '__len__' is abstract in class 'Structure' but is not overridden:UNDEFINED
-abstract-method:87:0:91:19:Iterator:Method '__contains__' is abstract in class 'Structure' but is not overridden:UNDEFINED
-abstract-method:87:0:91:19:Iterator:Method '__hash__' is abstract in class 'Structure' but is not overridden:UNDEFINED
-abstract-method:87:0:91:19:Iterator:Method '__len__' is abstract in class 'Structure' but is not overridden:UNDEFINED
-abstract-method:106:0:107:8:BadComplexMro:Method '__hash__' is abstract in class 'Structure' but is not overridden:UNDEFINED
-abstract-method:106:0:107:8:BadComplexMro:Method '__len__' is abstract in class 'AbstractSizable' but is not overridden:UNDEFINED
-abstract-method:106:0:107:8:BadComplexMro:Method 'length' is abstract in class 'AbstractSizable' but is not overridden:UNDEFINED
+abstract-method:47:0:47:14:Concrete:Method 'bbbb' is abstract in class 'Abstract' but is not overridden:UNDEFINED
+abstract-method:70:0:70:15:Container:Method '__hash__' is abstract in class 'Structure' but is not overridden:UNDEFINED
+abstract-method:70:0:70:15:Container:Method '__iter__' is abstract in class 'Structure' but is not overridden:UNDEFINED
+abstract-method:70:0:70:15:Container:Method '__len__' is abstract in class 'Structure' but is not overridden:UNDEFINED
+abstract-method:76:0:76:13:Sizable:Method '__contains__' is abstract in class 'Structure' but is not overridden:UNDEFINED
+abstract-method:76:0:76:13:Sizable:Method '__hash__' is abstract in class 'Structure' but is not overridden:UNDEFINED
+abstract-method:76:0:76:13:Sizable:Method '__iter__' is abstract in class 'Structure' but is not overridden:UNDEFINED
+abstract-method:82:0:82:14:Hashable:Method '__contains__' is abstract in class 'Structure' but is not overridden:UNDEFINED
+abstract-method:82:0:82:14:Hashable:Method '__iter__' is abstract in class 'Structure' but is not overridden:UNDEFINED
+abstract-method:82:0:82:14:Hashable:Method '__len__' is abstract in class 'Structure' but is not overridden:UNDEFINED
+abstract-method:87:0:87:14:Iterator:Method '__contains__' is abstract in class 'Structure' but is not overridden:UNDEFINED
+abstract-method:87:0:87:14:Iterator:Method '__hash__' is abstract in class 'Structure' but is not overridden:UNDEFINED
+abstract-method:87:0:87:14:Iterator:Method '__len__' is abstract in class 'Structure' but is not overridden:UNDEFINED
+abstract-method:106:0:106:19:BadComplexMro:Method '__hash__' is abstract in class 'Structure' but is not overridden:UNDEFINED
+abstract-method:106:0:106:19:BadComplexMro:Method '__len__' is abstract in class 'AbstractSizable' but is not overridden:UNDEFINED
+abstract-method:106:0:106:19:BadComplexMro:Method 'length' is abstract in class 'AbstractSizable' but is not overridden:UNDEFINED
diff --git a/tests/functional/a/access/access_attr_before_def_false_positive.txt b/tests/functional/a/access/access_attr_before_def_false_positive.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/a/access/access_to_protected_members_typing.txt b/tests/functional/a/access/access_to_protected_members_typing.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/a/alternative/alternative_union_syntax.txt b/tests/functional/a/alternative/alternative_union_syntax.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/a/arguments_differ.txt b/tests/functional/a/arguments_differ.txt
index 5cce378e27..07ef79a0f9 100644
--- a/tests/functional/a/arguments_differ.txt
+++ b/tests/functional/a/arguments_differ.txt
@@ -1,12 +1,12 @@
-arguments-differ:12:4:13:12:Child.test:Number of parameters was 1 in 'Parent.test' and is now 2 in overridden 'Child.test' method:UNDEFINED
-arguments-differ:23:4:24:12:ChildDefaults.test:Number of parameters was 3 in 'ParentDefaults.test' and is now 2 in overridden 'ChildDefaults.test' method:UNDEFINED
-arguments-differ:41:4:42:12:ClassmethodChild.func:Number of parameters was 2 in 'Classmethod.func' and is now 0 in overridden 'ClassmethodChild.func' method:UNDEFINED
-arguments-differ:68:4:69:64:VarargsChild.has_kwargs:Variadics removed in overridden 'VarargsChild.has_kwargs' method:UNDEFINED
-arguments-renamed:71:4:72:89:VarargsChild.no_kwargs:Parameter 'args' has been renamed to 'arg' in overridden 'VarargsChild.no_kwargs' method:UNDEFINED
-arguments-differ:144:4:145:26:StaticmethodChild2.func:Number of parameters was 1 in 'Staticmethod.func' and is now 2 in overridden 'StaticmethodChild2.func' method:UNDEFINED
-arguments-differ:180:4:181:12:SecondChangesArgs.test:Number of parameters was 2 in 'FirstHasArgs.test' and is now 4 in overridden 'SecondChangesArgs.test' method:UNDEFINED
-arguments-differ:306:4:307:60:Foo.kwonly_1:Number of parameters was 4 in 'AbstractFoo.kwonly_1' and is now 3 in overridden 'Foo.kwonly_1' method:UNDEFINED
-arguments-differ:309:4:310:82:Foo.kwonly_2:Number of parameters was 3 in 'AbstractFoo.kwonly_2' and is now 2 in overridden 'Foo.kwonly_2' method:UNDEFINED
-arguments-differ:312:4:313:32:Foo.kwonly_3:Number of parameters was 3 in 'AbstractFoo.kwonly_3' and is now 3 in overridden 'Foo.kwonly_3' method:UNDEFINED
-arguments-differ:315:4:316:32:Foo.kwonly_4:Number of parameters was 3 in 'AbstractFoo.kwonly_4' and is now 3 in overridden 'Foo.kwonly_4' method:UNDEFINED
-arguments-differ:318:4:319:41:Foo.kwonly_5:Variadics removed in overridden 'Foo.kwonly_5' method:UNDEFINED
+arguments-differ:12:4:12:12:Child.test:Number of parameters was 1 in 'Parent.test' and is now 2 in overridden 'Child.test' method:UNDEFINED
+arguments-differ:23:4:23:12:ChildDefaults.test:Number of parameters was 3 in 'ParentDefaults.test' and is now 2 in overridden 'ChildDefaults.test' method:UNDEFINED
+arguments-differ:41:4:41:12:ClassmethodChild.func:Number of parameters was 2 in 'Classmethod.func' and is now 0 in overridden 'ClassmethodChild.func' method:UNDEFINED
+arguments-differ:68:4:68:18:VarargsChild.has_kwargs:Variadics removed in overridden 'VarargsChild.has_kwargs' method:UNDEFINED
+arguments-renamed:71:4:71:17:VarargsChild.no_kwargs:Parameter 'args' has been renamed to 'arg' in overridden 'VarargsChild.no_kwargs' method:UNDEFINED
+arguments-differ:144:4:144:12:StaticmethodChild2.func:Number of parameters was 1 in 'Staticmethod.func' and is now 2 in overridden 'StaticmethodChild2.func' method:UNDEFINED
+arguments-differ:180:4:180:12:SecondChangesArgs.test:Number of parameters was 2 in 'FirstHasArgs.test' and is now 4 in overridden 'SecondChangesArgs.test' method:UNDEFINED
+arguments-differ:306:4:306:16:Foo.kwonly_1:Number of parameters was 4 in 'AbstractFoo.kwonly_1' and is now 3 in overridden 'Foo.kwonly_1' method:UNDEFINED
+arguments-differ:309:4:309:16:Foo.kwonly_2:Number of parameters was 3 in 'AbstractFoo.kwonly_2' and is now 2 in overridden 'Foo.kwonly_2' method:UNDEFINED
+arguments-differ:312:4:312:16:Foo.kwonly_3:Number of parameters was 3 in 'AbstractFoo.kwonly_3' and is now 3 in overridden 'Foo.kwonly_3' method:UNDEFINED
+arguments-differ:315:4:315:16:Foo.kwonly_4:Number of parameters was 3 in 'AbstractFoo.kwonly_4' and is now 3 in overridden 'Foo.kwonly_4' method:UNDEFINED
+arguments-differ:318:4:318:16:Foo.kwonly_5:Variadics removed in overridden 'Foo.kwonly_5' method:UNDEFINED
diff --git a/tests/functional/a/arguments_differ_issue5371.txt b/tests/functional/a/arguments_differ_issue5371.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/a/arguments_renamed.txt b/tests/functional/a/arguments_renamed.txt
index 366aa47300..7f6466ba8d 100644
--- a/tests/functional/a/arguments_renamed.txt
+++ b/tests/functional/a/arguments_renamed.txt
@@ -1,11 +1,11 @@
-arguments-renamed:17:4:18:55:Orange.brew:Parameter 'fruit_name' has been renamed to 'orange_name' in overridden 'Orange.brew' method:UNDEFINED
-arguments-renamed:20:4:21:69:Orange.eat_with_condiment:Parameter 'fruit_name' has been renamed to 'orange_name' in overridden 'Orange.eat_with_condiment' method:UNDEFINED
-arguments-differ:27:4:28:68:Banana.eat_with_condiment:Number of parameters was 3 in 'Fruit.eat_with_condiment' and is now 4 in overridden 'Banana.eat_with_condiment' method:UNDEFINED
-arguments-renamed:40:4:41:23:Child.test:Parameter 'arg' has been renamed to 'arg1' in overridden 'Child.test' method:UNDEFINED
-arguments-renamed:43:4:44:61:Child.kwargs_test:Parameter 'var1' has been renamed to 'value1' in overridden 'Child.kwargs_test' method:UNDEFINED
-arguments-renamed:48:4:49:22:Child2.test:Parameter 'arg' has been renamed to 'var' in overridden 'Child2.test' method:UNDEFINED
-arguments-differ:51:4:52:58:Child2.kwargs_test:Number of parameters was 4 in 'Parent.kwargs_test' and is now 3 in overridden 'Child2.kwargs_test' method:UNDEFINED
-arguments-renamed:51:4:52:58:Child2.kwargs_test:Parameter 'var2' has been renamed to 'kw2' in overridden 'Child2.kwargs_test' method:UNDEFINED
-arguments-renamed:67:4:68:56:ChildDefaults.test1:Parameter 'barg' has been renamed to 'param2' in overridden 'ChildDefaults.test1' method:UNDEFINED
-arguments-renamed:95:8:96:59:FruitOverrideConditional.brew:Parameter 'fruit_name' has been renamed to 'orange_name' in overridden 'FruitOverrideConditional.brew' method:UNDEFINED
-arguments-differ:99:12:100:76:FruitOverrideConditional.eat_with_condiment:Number of parameters was 3 in 'FruitConditional.eat_with_condiment' and is now 4 in overridden 'FruitOverrideConditional.eat_with_condiment' method:UNDEFINED
+arguments-renamed:17:4:17:12:Orange.brew:Parameter 'fruit_name' has been renamed to 'orange_name' in overridden 'Orange.brew' method:UNDEFINED
+arguments-renamed:20:4:20:26:Orange.eat_with_condiment:Parameter 'fruit_name' has been renamed to 'orange_name' in overridden 'Orange.eat_with_condiment' method:UNDEFINED
+arguments-differ:27:4:27:26:Banana.eat_with_condiment:Number of parameters was 3 in 'Fruit.eat_with_condiment' and is now 4 in overridden 'Banana.eat_with_condiment' method:UNDEFINED
+arguments-renamed:40:4:40:12:Child.test:Parameter 'arg' has been renamed to 'arg1' in overridden 'Child.test' method:UNDEFINED
+arguments-renamed:43:4:43:19:Child.kwargs_test:Parameter 'var1' has been renamed to 'value1' in overridden 'Child.kwargs_test' method:UNDEFINED
+arguments-renamed:48:4:48:12:Child2.test:Parameter 'arg' has been renamed to 'var' in overridden 'Child2.test' method:UNDEFINED
+arguments-differ:51:4:51:19:Child2.kwargs_test:Number of parameters was 4 in 'Parent.kwargs_test' and is now 3 in overridden 'Child2.kwargs_test' method:UNDEFINED
+arguments-renamed:51:4:51:19:Child2.kwargs_test:Parameter 'var2' has been renamed to 'kw2' in overridden 'Child2.kwargs_test' method:UNDEFINED
+arguments-renamed:67:4:67:13:ChildDefaults.test1:Parameter 'barg' has been renamed to 'param2' in overridden 'ChildDefaults.test1' method:UNDEFINED
+arguments-renamed:95:8:95:16:FruitOverrideConditional.brew:Parameter 'fruit_name' has been renamed to 'orange_name' in overridden 'FruitOverrideConditional.brew' method:UNDEFINED
+arguments-differ:99:12:99:34:FruitOverrideConditional.eat_with_condiment:Number of parameters was 3 in 'FruitConditional.eat_with_condiment' and is now 4 in overridden 'FruitOverrideConditional.eat_with_condiment' method:UNDEFINED
diff --git a/tests/functional/a/assignment/assignment_from_no_return_py3.txt b/tests/functional/a/assignment/assignment_from_no_return_py3.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/a/async_functions.txt b/tests/functional/a/async_functions.txt
index 535e387097..7ab56e2d3c 100644
--- a/tests/functional/a/async_functions.txt
+++ b/tests/functional/a/async_functions.txt
@@ -1,11 +1,11 @@
-redefined-builtin:5:0:6:8:next:Redefining built-in 'next':UNDEFINED
+redefined-builtin:5:0:5:14:next:Redefining built-in 'next':UNDEFINED
 unused-argument:8:30:8:34:some_function:Unused argument 'arg2':HIGH
 bad-super-call:22:8:22:31:Class.some_method:Bad first argument 'OtherClass' given to super():UNDEFINED
-too-many-arguments:26:0:53:12:complex_function:Too many arguments (10/5):UNDEFINED
-too-many-branches:26:0:53:12:complex_function:Too many branches (13/12):UNDEFINED
-too-many-return-statements:26:0:53:12:complex_function:Too many return statements (10/6):UNDEFINED
-dangerous-default-value:57:0:58:15:func:Dangerous default value [] as argument:UNDEFINED
+too-many-arguments:26:0:26:26:complex_function:Too many arguments (10/5):UNDEFINED
+too-many-branches:26:0:26:26:complex_function:Too many branches (13/12):UNDEFINED
+too-many-return-statements:26:0:26:26:complex_function:Too many return statements (10/6):UNDEFINED
+dangerous-default-value:57:0:57:14:func:Dangerous default value [] as argument:UNDEFINED
 duplicate-argument-name:57:15:57:16:func:Duplicate argument name a in function definition:UNDEFINED
 duplicate-argument-name:57:18:57:19:func:Duplicate argument name a in function definition:UNDEFINED
-disallowed-name:62:0:63:6:foo:"Disallowed name ""foo""":UNDEFINED
-empty-docstring:62:0:63:6:foo:Empty function docstring:HIGH
+disallowed-name:62:0:62:13:foo:"Disallowed name ""foo""":UNDEFINED
+empty-docstring:62:0:62:13:foo:Empty function docstring:HIGH
diff --git a/tests/functional/b/bad_reversed_sequence_py38.txt b/tests/functional/b/bad_reversed_sequence_py38.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/b/bad_staticmethod_argument.txt b/tests/functional/b/bad_staticmethod_argument.txt
index 115555c31b..1456726875 100644
--- a/tests/functional/b/bad_staticmethod_argument.txt
+++ b/tests/functional/b/bad_staticmethod_argument.txt
@@ -1,2 +1,2 @@
-bad-staticmethod-argument:5:4:6:12:Abcd.method1:Static method with 'self' as first argument:UNDEFINED
-bad-staticmethod-argument:10:4:11:12:Abcd.method2:Static method with 'cls' as first argument:UNDEFINED
+bad-staticmethod-argument:5:4:5:15:Abcd.method1:Static method with 'self' as first argument:UNDEFINED
+bad-staticmethod-argument:10:4:10:15:Abcd.method2:Static method with 'cls' as first argument:UNDEFINED
diff --git a/tests/functional/b/base_init_vars.txt b/tests/functional/b/base_init_vars.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/b/blacklisted_name.txt b/tests/functional/b/blacklisted_name.txt
index 63fe309713..b6b96c5901 100644
--- a/tests/functional/b/blacklisted_name.txt
+++ b/tests/functional/b/blacklisted_name.txt
@@ -1 +1 @@
-disallowed-name:3:0:4:8:baz:"Disallowed name ""baz""":UNDEFINED
+disallowed-name:3:0:3:7:baz:"Disallowed name ""baz""":UNDEFINED
diff --git a/tests/functional/b/bugfix_local_scope_metaclass_1177.txt b/tests/functional/b/bugfix_local_scope_metaclass_1177.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/b/builtin_module_test.txt b/tests/functional/b/builtin_module_test.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/c/cached_property.txt b/tests/functional/c/cached_property.txt
index a4b52237c8..3756dd9198 100644
--- a/tests/functional/c/cached_property.txt
+++ b/tests/functional/c/cached_property.txt
@@ -1 +1 @@
-invalid-overridden-method:22:4:23:17:Child.func:Method 'func' was expected to be 'method', found it instead as 'property':UNDEFINED
+invalid-overridden-method:22:4:22:12:Child.func:Method 'func' was expected to be 'method', found it instead as 'property':UNDEFINED
diff --git a/tests/functional/c/class_attributes.txt b/tests/functional/c/class_attributes.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/c/class_members.txt b/tests/functional/c/class_members.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/c/class_protocol_ellipsis.txt b/tests/functional/c/class_protocol_ellipsis.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/c/class_variable_slots_conflict_exempted.txt b/tests/functional/c/class_variable_slots_conflict_exempted.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/c/classes_meth_could_be_a_function.txt b/tests/functional/c/classes_meth_could_be_a_function.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/c/classes_protected_member_access.txt b/tests/functional/c/classes_protected_member_access.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/c/comparison_with_callable_typing_constants.txt b/tests/functional/c/comparison_with_callable_typing_constants.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/c/consider/consider_using_sys_exit_exempted.txt b/tests/functional/c/consider/consider_using_sys_exit_exempted.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/c/consider/consider_using_sys_exit_local_scope.txt b/tests/functional/c/consider/consider_using_sys_exit_local_scope.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/c/control_pragmas.txt b/tests/functional/c/control_pragmas.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/c/crash_missing_module_type.txt b/tests/functional/c/crash_missing_module_type.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/d/dangerous_default_value.txt b/tests/functional/d/dangerous_default_value.txt
index 5d809f2359..98d55c2b62 100644
--- a/tests/functional/d/dangerous_default_value.txt
+++ b/tests/functional/d/dangerous_default_value.txt
@@ -1,22 +1,22 @@
-dangerous-default-value:6:0:8:16:function1:Dangerous default value [] as argument:UNDEFINED
-dangerous-default-value:10:0:12:16:function2:Dangerous default value HEHE (builtins.dict) as argument:UNDEFINED
-dangerous-default-value:18:0:20:16:function4:Dangerous default value set() (builtins.set) as argument:UNDEFINED
-dangerous-default-value:28:0:30:16:function6:Dangerous default value GLOBAL_SET (builtins.set) as argument:UNDEFINED
-dangerous-default-value:32:0:34:16:function7:Dangerous default value dict() (builtins.dict) as argument:UNDEFINED
-dangerous-default-value:36:0:38:16:function8:Dangerous default value list() (builtins.list) as argument:UNDEFINED
-dangerous-default-value:40:0:42:16:function9:Dangerous default value [] as argument:UNDEFINED
-dangerous-default-value:44:0:46:16:function10:Dangerous default value {} as argument:UNDEFINED
-dangerous-default-value:48:0:50:16:function11:Dangerous default value list() (builtins.list) as argument:UNDEFINED
-dangerous-default-value:52:0:54:16:function12:Dangerous default value dict() (builtins.dict) as argument:UNDEFINED
-dangerous-default-value:61:0:63:16:function13:Dangerous default value OINK (builtins.dict) as argument:UNDEFINED
-dangerous-default-value:65:0:69:16:function14:Dangerous default value dict() (builtins.dict) as argument:UNDEFINED
-dangerous-default-value:73:0:75:16:function15:Dangerous default value INVALID_DICT (builtins.dict) as argument:UNDEFINED
-dangerous-default-value:77:0:79:16:function16:Dangerous default value set() as argument:UNDEFINED
-dangerous-default-value:81:0:83:16:function17:Dangerous default value deque() (collections.deque) as argument:UNDEFINED
-dangerous-default-value:85:0:87:16:function18:Dangerous default value ChainMap() (collections.ChainMap) as argument:UNDEFINED
-dangerous-default-value:89:0:91:16:function19:Dangerous default value Counter() (collections.Counter) as argument:UNDEFINED
-dangerous-default-value:93:0:95:16:function20:Dangerous default value OrderedDict() (collections.OrderedDict) as argument:UNDEFINED
-dangerous-default-value:97:0:99:16:function21:Dangerous default value defaultdict() (collections.defaultdict) as argument:UNDEFINED
-dangerous-default-value:101:0:103:16:function22:Dangerous default value UserDict() (collections.UserDict) as argument:UNDEFINED
-dangerous-default-value:105:0:107:16:function23:Dangerous default value UserList() (collections.UserList) as argument:UNDEFINED
-dangerous-default-value:109:0:111:16:function24:Dangerous default value [] as argument:UNDEFINED
+dangerous-default-value:6:0:6:13:function1:Dangerous default value [] as argument:UNDEFINED
+dangerous-default-value:10:0:10:13:function2:Dangerous default value HEHE (builtins.dict) as argument:UNDEFINED
+dangerous-default-value:18:0:18:13:function4:Dangerous default value set() (builtins.set) as argument:UNDEFINED
+dangerous-default-value:28:0:28:13:function6:Dangerous default value GLOBAL_SET (builtins.set) as argument:UNDEFINED
+dangerous-default-value:32:0:32:13:function7:Dangerous default value dict() (builtins.dict) as argument:UNDEFINED
+dangerous-default-value:36:0:36:13:function8:Dangerous default value list() (builtins.list) as argument:UNDEFINED
+dangerous-default-value:40:0:40:13:function9:Dangerous default value [] as argument:UNDEFINED
+dangerous-default-value:44:0:44:14:function10:Dangerous default value {} as argument:UNDEFINED
+dangerous-default-value:48:0:48:14:function11:Dangerous default value list() (builtins.list) as argument:UNDEFINED
+dangerous-default-value:52:0:52:14:function12:Dangerous default value dict() (builtins.dict) as argument:UNDEFINED
+dangerous-default-value:61:0:61:14:function13:Dangerous default value OINK (builtins.dict) as argument:UNDEFINED
+dangerous-default-value:65:0:65:14:function14:Dangerous default value dict() (builtins.dict) as argument:UNDEFINED
+dangerous-default-value:73:0:73:14:function15:Dangerous default value INVALID_DICT (builtins.dict) as argument:UNDEFINED
+dangerous-default-value:77:0:77:14:function16:Dangerous default value set() as argument:UNDEFINED
+dangerous-default-value:81:0:81:14:function17:Dangerous default value deque() (collections.deque) as argument:UNDEFINED
+dangerous-default-value:85:0:85:14:function18:Dangerous default value ChainMap() (collections.ChainMap) as argument:UNDEFINED
+dangerous-default-value:89:0:89:14:function19:Dangerous default value Counter() (collections.Counter) as argument:UNDEFINED
+dangerous-default-value:93:0:93:14:function20:Dangerous default value OrderedDict() (collections.OrderedDict) as argument:UNDEFINED
+dangerous-default-value:97:0:97:14:function21:Dangerous default value defaultdict() (collections.defaultdict) as argument:UNDEFINED
+dangerous-default-value:101:0:101:14:function22:Dangerous default value UserDict() (collections.UserDict) as argument:UNDEFINED
+dangerous-default-value:105:0:105:14:function23:Dangerous default value UserList() (collections.UserList) as argument:UNDEFINED
+dangerous-default-value:109:0:109:14:function24:Dangerous default value [] as argument:UNDEFINED
diff --git a/tests/functional/d/dataclass_typecheck.txt b/tests/functional/d/dataclass_typecheck.txt
index e898c85fad..97f5860bb6 100644
--- a/tests/functional/d/dataclass_typecheck.txt
+++ b/tests/functional/d/dataclass_typecheck.txt
@@ -7,6 +7,6 @@ unsubscriptable-object:56:6:56:15::Value 'obj.attr1' is unsubscriptable:UNDEFINE
 unsupported-assignment-operation:61:0:61:9::'obj.attr1' does not support item assignment:UNDEFINED
 unsupported-delete-operation:66:4:66:13::'obj.attr1' does not support item deletion:UNDEFINED
 not-context-manager:91:0:92:8::Context manager 'str' doesn't implement __enter__ and __exit__.:UNDEFINED
-invalid-metaclass:99:0:100:8:Test2:Invalid metaclass 'Instance of builtins.int' used:UNDEFINED
+invalid-metaclass:99:0:99:11:Test2:Invalid metaclass 'Instance of builtins.int' used:UNDEFINED
 unhashable-dict-key:105:0:105:2::Dict key is unhashable:UNDEFINED
 isinstance-second-argument-not-valid-type:115:6:115:30::Second argument of isinstance is not a type:UNDEFINED
diff --git a/tests/functional/d/decorator_scope.txt b/tests/functional/d/decorator_scope.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/d/decorator_unused.txt b/tests/functional/d/decorator_unused.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/d/defined_and_used_on_same_line.txt b/tests/functional/d/defined_and_used_on_same_line.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/d/deprecated/deprecated_method_suppression.txt b/tests/functional/d/deprecated/deprecated_method_suppression.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/d/disable_msg_github_issue_1389.txt b/tests/functional/d/disable_msg_github_issue_1389.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/d/disable_msg_next_line.txt b/tests/functional/d/disable_msg_next_line.txt
index 6601f74377..36ba9527d2 100644
--- a/tests/functional/d/disable_msg_next_line.txt
+++ b/tests/functional/d/disable_msg_next_line.txt
@@ -1,5 +1,5 @@
 invalid-name:15:4:15:5:function_C:"Variable name ""x"" doesn't conform to snake_case naming style":HIGH
 unused-variable:15:4:15:5:function_C:Unused variable 'x':UNDEFINED
 f-string-without-interpolation:16:11:16:44:function_C:Using an f-string that does not have any interpolated variables:UNDEFINED
-invalid-name:19:0:20:15:function_D:"Function name ""function_D"" doesn't conform to snake_case naming style":HIGH
+invalid-name:19:0:19:14:function_D:"Function name ""function_D"" doesn't conform to snake_case naming style":HIGH
 unused-argument:19:21:19:25:function_D:Unused argument 'arg2':HIGH
diff --git a/tests/functional/d/disable_wrong_import_position.txt b/tests/functional/d/disable_wrong_import_position.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/d/disabled_msgid_in_pylintrc.txt b/tests/functional/d/disabled_msgid_in_pylintrc.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/d/docstrings.txt b/tests/functional/d/docstrings.txt
index 31e25bf368..d1e21f7af5 100644
--- a/tests/functional/d/docstrings.txt
+++ b/tests/functional/d/docstrings.txt
@@ -1,8 +1,8 @@
 missing-module-docstring:1:0:None:None::Missing module docstring:HIGH
-empty-docstring:6:0:7:10:function0:Empty function docstring:HIGH
-missing-function-docstring:10:0:12:16:function1:Missing function or method docstring:HIGH
-missing-class-docstring:23:0:53:12:AAAA:Missing class docstring:HIGH
-missing-function-docstring:40:4:41:12:AAAA.method1:Missing function or method docstring:INFERENCE
-empty-docstring:48:4:50:12:AAAA.method3:Empty method docstring:INFERENCE
-empty-docstring:62:4:64:12:DDDD.method2:Empty method docstring:INFERENCE
-missing-function-docstring:70:4:71:12:DDDD.method4:Missing function or method docstring:INFERENCE
+empty-docstring:6:0:6:13:function0:Empty function docstring:HIGH
+missing-function-docstring:10:0:10:13:function1:Missing function or method docstring:HIGH
+missing-class-docstring:23:0:23:10:AAAA:Missing class docstring:HIGH
+missing-function-docstring:40:4:40:15:AAAA.method1:Missing function or method docstring:INFERENCE
+empty-docstring:48:4:48:15:AAAA.method3:Empty method docstring:INFERENCE
+empty-docstring:62:4:62:15:DDDD.method2:Empty method docstring:INFERENCE
+missing-function-docstring:70:4:70:15:DDDD.method4:Missing function or method docstring:INFERENCE
diff --git a/tests/functional/d/dotted_ancestor.txt b/tests/functional/d/dotted_ancestor.txt
index 9d45ae6bee..f7c6e1f251 100644
--- a/tests/functional/d/dotted_ancestor.txt
+++ b/tests/functional/d/dotted_ancestor.txt
@@ -1 +1 @@
-too-few-public-methods:7:0:10:50:Aaaa:Too few public methods (0/2):UNDEFINED
+too-few-public-methods:7:0:7:10:Aaaa:Too few public methods (0/2):UNDEFINED
diff --git a/tests/functional/d/duplicate_bases.txt b/tests/functional/d/duplicate_bases.txt
index d656763207..f52bbfe44f 100644
--- a/tests/functional/d/duplicate_bases.txt
+++ b/tests/functional/d/duplicate_bases.txt
@@ -1 +1 @@
-duplicate-bases:5:0:6:8:Duplicates:Duplicate bases for class 'Duplicates':UNDEFINED
+duplicate-bases:5:0:5:16:Duplicates:Duplicate bases for class 'Duplicates':UNDEFINED
diff --git a/tests/functional/e/.#emacs_file_lock.txt b/tests/functional/e/.#emacs_file_lock.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/e/.#emacs_file_lock_by_conf.txt b/tests/functional/e/.#emacs_file_lock_by_conf.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/e/e1101_9588_base_attr_aug_assign.txt b/tests/functional/e/e1101_9588_base_attr_aug_assign.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/e/enum_subclasses.txt b/tests/functional/e/enum_subclasses.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/e/external_classmethod_crash.txt b/tests/functional/e/external_classmethod_crash.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/ext/code_style/cs_py_version_35.txt b/tests/functional/ext/code_style/cs_py_version_35.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/ext/docparams/docparams.txt b/tests/functional/ext/docparams/docparams.txt
index 1fbad61851..c75a954414 100644
--- a/tests/functional/ext/docparams/docparams.txt
+++ b/tests/functional/ext/docparams/docparams.txt
@@ -1,12 +1,12 @@
-missing-return-doc:4:0:6:17:_private_func1:Missing return documentation:UNDEFINED
-missing-return-type-doc:4:0:6:17:_private_func1:Missing return type documentation:UNDEFINED
-missing-yield-doc:9:0:11:16:_private_func2:Missing yield documentation:UNDEFINED
-missing-yield-type-doc:9:0:11:16:_private_func2:Missing yield type documentation:UNDEFINED
-missing-raises-doc:14:0:16:30:_private_func3:"""Exception"" not documented as being raised":UNDEFINED
-missing-any-param-doc:19:0:21:17:public_func1:"Missing any documentation in ""public_func1""":UNDEFINED
-missing-return-doc:24:0:26:17:_async_private_func1:Missing return documentation:UNDEFINED
-missing-return-type-doc:24:0:26:17:_async_private_func1:Missing return type documentation:UNDEFINED
-missing-yield-doc:29:0:31:16:_async_private_func2:Missing yield documentation:UNDEFINED
-missing-yield-type-doc:29:0:31:16:_async_private_func2:Missing yield type documentation:UNDEFINED
-missing-raises-doc:34:0:36:30:_async_private_func3:"""Exception"" not documented as being raised":UNDEFINED
-missing-any-param-doc:39:0:41:17:async_public_func1:"Missing any documentation in ""async_public_func1""":UNDEFINED
+missing-return-doc:4:0:4:18:_private_func1:Missing return documentation:UNDEFINED
+missing-return-type-doc:4:0:4:18:_private_func1:Missing return type documentation:UNDEFINED
+missing-yield-doc:9:0:9:18:_private_func2:Missing yield documentation:UNDEFINED
+missing-yield-type-doc:9:0:9:18:_private_func2:Missing yield type documentation:UNDEFINED
+missing-raises-doc:14:0:14:18:_private_func3:"""Exception"" not documented as being raised":UNDEFINED
+missing-any-param-doc:19:0:19:16:public_func1:"Missing any documentation in ""public_func1""":UNDEFINED
+missing-return-doc:24:0:24:30:_async_private_func1:Missing return documentation:UNDEFINED
+missing-return-type-doc:24:0:24:30:_async_private_func1:Missing return type documentation:UNDEFINED
+missing-yield-doc:29:0:29:30:_async_private_func2:Missing yield documentation:UNDEFINED
+missing-yield-type-doc:29:0:29:30:_async_private_func2:Missing yield type documentation:UNDEFINED
+missing-raises-doc:34:0:34:30:_async_private_func3:"""Exception"" not documented as being raised":UNDEFINED
+missing-any-param-doc:39:0:39:28:async_public_func1:"Missing any documentation in ""async_public_func1""":UNDEFINED
diff --git a/tests/functional/ext/docparams/missing_param_doc.txt b/tests/functional/ext/docparams/missing_param_doc.txt
index c528212073..c43bdbd7ec 100644
--- a/tests/functional/ext/docparams/missing_param_doc.txt
+++ b/tests/functional/ext/docparams/missing_param_doc.txt
@@ -1,18 +1,18 @@
-missing-any-param-doc:3:0:6:21:foobar1:"Missing any documentation in ""foobar1""":UNDEFINED
-missing-any-param-doc:8:0:13:21:foobar2:"Missing any documentation in ""foobar2""":UNDEFINED
-missing-param-doc:15:0:22:27:foobar3:"""arg1, arg2, arg3"" missing in parameter documentation":UNDEFINED
-missing-type-doc:15:0:22:27:foobar3:"""arg2"" missing in parameter type documentation":UNDEFINED
-missing-param-doc:24:0:31:21:foobar4:"""arg2"" missing in parameter documentation":UNDEFINED
-missing-type-doc:24:0:31:21:foobar4:"""arg2"" missing in parameter type documentation":UNDEFINED
-missing-param-doc:33:0:41:21:foobar5:"""arg2"" missing in parameter documentation":UNDEFINED
-missing-type-doc:33:0:41:21:foobar5:"""arg1"" missing in parameter type documentation":UNDEFINED
-missing-param-doc:43:0:51:27:foobar6:"""arg2, arg3"" missing in parameter documentation":UNDEFINED
-missing-type-doc:43:0:51:27:foobar6:"""arg3"" missing in parameter type documentation":UNDEFINED
-missing-any-param-doc:53:0:59:21:foobar7:"Missing any documentation in ""foobar7""":UNDEFINED
-missing-any-param-doc:61:0:64:15:foobar8:"Missing any documentation in ""foobar8""":UNDEFINED
-missing-param-doc:66:0:74:27:foobar9:"""arg1, arg2, arg3"" missing in parameter documentation":UNDEFINED
-missing-param-doc:76:0:86:27:foobar10:"""arg2"" missing in parameter documentation":UNDEFINED
-missing-type-doc:76:0:86:27:foobar10:"""arg1, arg3"" missing in parameter type documentation":UNDEFINED
-missing-any-param-doc:88:0:95:21:foobar11:"Missing any documentation in ""foobar11""":UNDEFINED
-missing-param-doc:97:0:106:27:foobar12:"""arg1, arg3"" missing in parameter documentation":UNDEFINED
-missing-type-doc:97:0:106:27:foobar12:"""arg2, arg3"" missing in parameter type documentation":UNDEFINED
+missing-any-param-doc:3:0:3:11:foobar1:"Missing any documentation in ""foobar1""":UNDEFINED
+missing-any-param-doc:8:0:8:11:foobar2:"Missing any documentation in ""foobar2""":UNDEFINED
+missing-param-doc:15:0:15:11:foobar3:"""arg1, arg2, arg3"" missing in parameter documentation":UNDEFINED
+missing-type-doc:15:0:15:11:foobar3:"""arg2"" missing in parameter type documentation":UNDEFINED
+missing-param-doc:24:0:24:11:foobar4:"""arg2"" missing in parameter documentation":UNDEFINED
+missing-type-doc:24:0:24:11:foobar4:"""arg2"" missing in parameter type documentation":UNDEFINED
+missing-param-doc:33:0:33:11:foobar5:"""arg2"" missing in parameter documentation":UNDEFINED
+missing-type-doc:33:0:33:11:foobar5:"""arg1"" missing in parameter type documentation":UNDEFINED
+missing-param-doc:43:0:43:11:foobar6:"""arg2, arg3"" missing in parameter documentation":UNDEFINED
+missing-type-doc:43:0:43:11:foobar6:"""arg3"" missing in parameter type documentation":UNDEFINED
+missing-any-param-doc:53:0:53:11:foobar7:"Missing any documentation in ""foobar7""":UNDEFINED
+missing-any-param-doc:61:0:61:11:foobar8:"Missing any documentation in ""foobar8""":UNDEFINED
+missing-param-doc:66:0:66:11:foobar9:"""arg1, arg2, arg3"" missing in parameter documentation":UNDEFINED
+missing-param-doc:76:0:76:12:foobar10:"""arg2"" missing in parameter documentation":UNDEFINED
+missing-type-doc:76:0:76:12:foobar10:"""arg1, arg3"" missing in parameter type documentation":UNDEFINED
+missing-any-param-doc:88:0:88:12:foobar11:"Missing any documentation in ""foobar11""":UNDEFINED
+missing-param-doc:97:0:97:12:foobar12:"""arg1, arg3"" missing in parameter documentation":UNDEFINED
+missing-type-doc:97:0:97:12:foobar12:"""arg2, arg3"" missing in parameter type documentation":UNDEFINED
diff --git a/tests/functional/ext/docparams/parameter/missing_param_doc.txt b/tests/functional/ext/docparams/parameter/missing_param_doc.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/ext/docparams/parameter/missing_param_doc_required.txt b/tests/functional/ext/docparams/parameter/missing_param_doc_required.txt
index e1672e427c..1db477b902 100644
--- a/tests/functional/ext/docparams/parameter/missing_param_doc_required.txt
+++ b/tests/functional/ext/docparams/parameter/missing_param_doc_required.txt
@@ -1,3 +1,3 @@
-missing-any-param-doc:7:0:12:38:test_don_t_tolerate_no_param_documentation_at_all:"Missing any documentation in ""test_don_t_tolerate_no_param_documentation_at_all""":UNDEFINED
-missing-param-doc:44:0:51:7:test_kwonlyargs_are_taken_in_account:"""missing_kwonly"" missing in parameter documentation":UNDEFINED
-missing-type-doc:44:0:51:7:test_kwonlyargs_are_taken_in_account:"""missing_kwonly"" missing in parameter type documentation":UNDEFINED
+missing-any-param-doc:7:0:7:53:test_don_t_tolerate_no_param_documentation_at_all:"Missing any documentation in ""test_don_t_tolerate_no_param_documentation_at_all""":UNDEFINED
+missing-param-doc:44:0:44:40:test_kwonlyargs_are_taken_in_account:"""missing_kwonly"" missing in parameter documentation":UNDEFINED
+missing-type-doc:44:0:44:40:test_kwonlyargs_are_taken_in_account:"""missing_kwonly"" missing in parameter type documentation":UNDEFINED
diff --git a/tests/functional/ext/docparams/parameter/missing_param_doc_required_Google.txt b/tests/functional/ext/docparams/parameter/missing_param_doc_required_Google.txt
index 6efbd6b1c5..c0daa6ee21 100644
--- a/tests/functional/ext/docparams/parameter/missing_param_doc_required_Google.txt
+++ b/tests/functional/ext/docparams/parameter/missing_param_doc_required_Google.txt
@@ -1,26 +1,26 @@
-missing-param-doc:24:0:35:7:test_missing_func_params_in_google_docstring:"""y"" missing in parameter documentation":UNDEFINED
-missing-type-doc:24:0:35:7:test_missing_func_params_in_google_docstring:"""x, y"" missing in parameter type documentation":UNDEFINED
-missing-type-doc:80:0:92:7:test_missing_func_params_with_partial_annotations_in_google_docstring:"""x"" missing in parameter type documentation":UNDEFINED
-differing-param-doc:129:0:142:28:test_func_params_and_wrong_keyword_params_in_google_docstring:"""these"" differing in parameter documentation":UNDEFINED
-differing-type-doc:129:0:142:28:test_func_params_and_wrong_keyword_params_in_google_docstring:"""these"" differing in parameter type documentation":UNDEFINED
-missing-param-doc:129:0:142:28:test_func_params_and_wrong_keyword_params_in_google_docstring:"""that"" missing in parameter documentation":UNDEFINED
-missing-type-doc:129:0:142:28:test_func_params_and_wrong_keyword_params_in_google_docstring:"""that"" missing in parameter type documentation":UNDEFINED
-missing-param-doc:146:4:156:11:Foo.test_missing_method_params_in_google_docstring:"""y"" missing in parameter documentation":UNDEFINED
-missing-type-doc:146:4:156:11:Foo.test_missing_method_params_in_google_docstring:"""x, y"" missing in parameter type documentation":UNDEFINED
-differing-param-doc:177:0:189:22:test_wrong_name_of_func_params_in_google_docstring_one:"""xarg1, zarg1"" differing in parameter documentation":UNDEFINED
-differing-type-doc:177:0:189:22:test_wrong_name_of_func_params_in_google_docstring_one:"""xarg1, zarg1"" differing in parameter type documentation":UNDEFINED
-missing-param-doc:177:0:189:22:test_wrong_name_of_func_params_in_google_docstring_one:"""xarg, zarg"" missing in parameter documentation":UNDEFINED
-missing-type-doc:177:0:189:22:test_wrong_name_of_func_params_in_google_docstring_one:"""xarg, zarg"" missing in parameter type documentation":UNDEFINED
-differing-param-doc:192:0:203:22:test_wrong_name_of_func_params_in_google_docstring_two:"""yarg1"" differing in parameter documentation":UNDEFINED
-differing-type-doc:192:0:203:22:test_wrong_name_of_func_params_in_google_docstring_two:"""yarg1"" differing in parameter type documentation":UNDEFINED
-missing-param-doc:219:0:233:12:ClassFoo:"""x"" missing in parameter documentation":UNDEFINED
-missing-type-doc:219:0:233:12:ClassFoo:"""x, y"" missing in parameter type documentation":UNDEFINED
-missing-param-doc:237:4:246:11:ClassFoo.__init__:"""x"" missing in parameter documentation":UNDEFINED
-missing-type-doc:237:4:246:11:ClassFoo.__init__:"""x, y"" missing in parameter type documentation":UNDEFINED
-missing-param-doc:249:0:270:11:ClassFoo:"""x"" missing in parameter documentation":UNDEFINED
-missing-type-doc:249:0:270:11:ClassFoo:"""x, y"" missing in parameter type documentation":UNDEFINED
-multiple-constructor-doc:249:0:270:11:ClassFoo:"""ClassFoo"" has constructor parameters documented in class and __init__":UNDEFINED
-missing-param-doc:263:4:270:11:ClassFoo.__init__:"""x"" missing in parameter documentation":UNDEFINED
-missing-type-doc:263:4:270:11:ClassFoo.__init__:"""x, y"" missing in parameter type documentation":UNDEFINED
-missing-param-doc:273:0:283:24:test_warns_missing_args_google:"""*args"" missing in parameter documentation":UNDEFINED
-missing-param-doc:286:0:296:24:test_warns_missing_kwargs_google:"""**kwargs"" missing in parameter documentation":UNDEFINED
+missing-param-doc:24:0:24:48:test_missing_func_params_in_google_docstring:"""y"" missing in parameter documentation":UNDEFINED
+missing-type-doc:24:0:24:48:test_missing_func_params_in_google_docstring:"""x, y"" missing in parameter type documentation":UNDEFINED
+missing-type-doc:80:0:80:73:test_missing_func_params_with_partial_annotations_in_google_docstring:"""x"" missing in parameter type documentation":UNDEFINED
+differing-param-doc:129:0:129:65:test_func_params_and_wrong_keyword_params_in_google_docstring:"""these"" differing in parameter documentation":UNDEFINED
+differing-type-doc:129:0:129:65:test_func_params_and_wrong_keyword_params_in_google_docstring:"""these"" differing in parameter type documentation":UNDEFINED
+missing-param-doc:129:0:129:65:test_func_params_and_wrong_keyword_params_in_google_docstring:"""that"" missing in parameter documentation":UNDEFINED
+missing-type-doc:129:0:129:65:test_func_params_and_wrong_keyword_params_in_google_docstring:"""that"" missing in parameter type documentation":UNDEFINED
+missing-param-doc:146:4:146:54:Foo.test_missing_method_params_in_google_docstring:"""y"" missing in parameter documentation":UNDEFINED
+missing-type-doc:146:4:146:54:Foo.test_missing_method_params_in_google_docstring:"""x, y"" missing in parameter type documentation":UNDEFINED
+differing-param-doc:177:0:177:58:test_wrong_name_of_func_params_in_google_docstring_one:"""xarg1, zarg1"" differing in parameter documentation":UNDEFINED
+differing-type-doc:177:0:177:58:test_wrong_name_of_func_params_in_google_docstring_one:"""xarg1, zarg1"" differing in parameter type documentation":UNDEFINED
+missing-param-doc:177:0:177:58:test_wrong_name_of_func_params_in_google_docstring_one:"""xarg, zarg"" missing in parameter documentation":UNDEFINED
+missing-type-doc:177:0:177:58:test_wrong_name_of_func_params_in_google_docstring_one:"""xarg, zarg"" missing in parameter type documentation":UNDEFINED
+differing-param-doc:192:0:192:58:test_wrong_name_of_func_params_in_google_docstring_two:"""yarg1"" differing in parameter documentation":UNDEFINED
+differing-type-doc:192:0:192:58:test_wrong_name_of_func_params_in_google_docstring_two:"""yarg1"" differing in parameter type documentation":UNDEFINED
+missing-param-doc:219:0:219:14:ClassFoo:"""x"" missing in parameter documentation":UNDEFINED
+missing-type-doc:219:0:219:14:ClassFoo:"""x, y"" missing in parameter type documentation":UNDEFINED
+missing-param-doc:237:4:237:16:ClassFoo.__init__:"""x"" missing in parameter documentation":UNDEFINED
+missing-type-doc:237:4:237:16:ClassFoo.__init__:"""x, y"" missing in parameter type documentation":UNDEFINED
+missing-param-doc:249:0:249:14:ClassFoo:"""x"" missing in parameter documentation":UNDEFINED
+missing-type-doc:249:0:249:14:ClassFoo:"""x, y"" missing in parameter type documentation":UNDEFINED
+multiple-constructor-doc:249:0:249:14:ClassFoo:"""ClassFoo"" has constructor parameters documented in class and __init__":UNDEFINED
+missing-param-doc:263:4:263:16:ClassFoo.__init__:"""x"" missing in parameter documentation":UNDEFINED
+missing-type-doc:263:4:263:16:ClassFoo.__init__:"""x, y"" missing in parameter type documentation":UNDEFINED
+missing-param-doc:273:0:273:34:test_warns_missing_args_google:"""*args"" missing in parameter documentation":UNDEFINED
+missing-param-doc:286:0:286:36:test_warns_missing_kwargs_google:"""**kwargs"" missing in parameter documentation":UNDEFINED
diff --git a/tests/functional/ext/docparams/parameter/missing_param_doc_required_Numpy.txt b/tests/functional/ext/docparams/parameter/missing_param_doc_required_Numpy.txt
index d4f8be211d..bd73de9cce 100644
--- a/tests/functional/ext/docparams/parameter/missing_param_doc_required_Numpy.txt
+++ b/tests/functional/ext/docparams/parameter/missing_param_doc_required_Numpy.txt
@@ -1,22 +1,22 @@
-missing-param-doc:9:0:23:7:test_missing_func_params_in_numpy_docstring:"""y"" missing in parameter documentation":UNDEFINED
-missing-type-doc:9:0:23:7:test_missing_func_params_in_numpy_docstring:"""x, y"" missing in parameter type documentation":UNDEFINED
-missing-param-doc:27:4:39:11:Foo.test_missing_method_params_in_numpy_docstring:"""y"" missing in parameter documentation":UNDEFINED
-missing-type-doc:27:4:39:11:Foo.test_missing_method_params_in_numpy_docstring:"""x, y"" missing in parameter type documentation":UNDEFINED
-differing-param-doc:66:0:82:22:test_wrong_name_of_func_params_in_numpy_docstring:"""xarg1, zarg1"" differing in parameter documentation":UNDEFINED
-differing-type-doc:66:0:82:22:test_wrong_name_of_func_params_in_numpy_docstring:"""xarg1, zarg1"" differing in parameter type documentation":UNDEFINED
-missing-param-doc:66:0:82:22:test_wrong_name_of_func_params_in_numpy_docstring:"""xarg, zarg"" missing in parameter documentation":UNDEFINED
-missing-type-doc:66:0:82:22:test_wrong_name_of_func_params_in_numpy_docstring:"""xarg, zarg"" missing in parameter type documentation":UNDEFINED
-differing-param-doc:85:0:98:22:test_wrong_name_of_func_params_in_numpy_docstring_two:"""yarg1"" differing in parameter documentation":UNDEFINED
-differing-type-doc:85:0:98:22:test_wrong_name_of_func_params_in_numpy_docstring_two:"""yarg1"" differing in parameter type documentation":UNDEFINED
-missing-param-doc:116:0:132:12:ClassFoo:"""x"" missing in parameter documentation":UNDEFINED
-missing-type-doc:116:0:132:12:ClassFoo:"""x, y"" missing in parameter type documentation":UNDEFINED
-missing-param-doc:156:4:169:11:ClassFoo.__init__:"""x"" missing in parameter documentation":UNDEFINED
-missing-type-doc:156:4:169:11:ClassFoo.__init__:"""x, y"" missing in parameter type documentation":UNDEFINED
-missing-param-doc:172:0:197:11:ClassFoo:"""x"" missing in parameter documentation":UNDEFINED
-missing-type-doc:172:0:197:11:ClassFoo:"""x, y"" missing in parameter type documentation":UNDEFINED
-multiple-constructor-doc:172:0:197:11:ClassFoo:"""ClassFoo"" has constructor parameters documented in class and __init__":UNDEFINED
-missing-param-doc:188:4:197:11:ClassFoo.__init__:"""x"" missing in parameter documentation":UNDEFINED
-missing-type-doc:188:4:197:11:ClassFoo.__init__:"""x, y"" missing in parameter type documentation":UNDEFINED
-missing-param-doc:200:0:214:24:test_warns_missing_args_numpy:"""*args"" missing in parameter documentation":UNDEFINED
-missing-param-doc:217:0:231:24:test_warns_missing_kwargs_numpy:"""**kwargs"" missing in parameter documentation":UNDEFINED
-missing-type-doc:234:0:256:24:test_finds_args_without_type_numpy:"""untyped_arg"" missing in parameter type documentation":UNDEFINED
+missing-param-doc:9:0:9:47:test_missing_func_params_in_numpy_docstring:"""y"" missing in parameter documentation":UNDEFINED
+missing-type-doc:9:0:9:47:test_missing_func_params_in_numpy_docstring:"""x, y"" missing in parameter type documentation":UNDEFINED
+missing-param-doc:27:4:27:53:Foo.test_missing_method_params_in_numpy_docstring:"""y"" missing in parameter documentation":UNDEFINED
+missing-type-doc:27:4:27:53:Foo.test_missing_method_params_in_numpy_docstring:"""x, y"" missing in parameter type documentation":UNDEFINED
+differing-param-doc:66:0:66:53:test_wrong_name_of_func_params_in_numpy_docstring:"""xarg1, zarg1"" differing in parameter documentation":UNDEFINED
+differing-type-doc:66:0:66:53:test_wrong_name_of_func_params_in_numpy_docstring:"""xarg1, zarg1"" differing in parameter type documentation":UNDEFINED
+missing-param-doc:66:0:66:53:test_wrong_name_of_func_params_in_numpy_docstring:"""xarg, zarg"" missing in parameter documentation":UNDEFINED
+missing-type-doc:66:0:66:53:test_wrong_name_of_func_params_in_numpy_docstring:"""xarg, zarg"" missing in parameter type documentation":UNDEFINED
+differing-param-doc:85:0:85:57:test_wrong_name_of_func_params_in_numpy_docstring_two:"""yarg1"" differing in parameter documentation":UNDEFINED
+differing-type-doc:85:0:85:57:test_wrong_name_of_func_params_in_numpy_docstring_two:"""yarg1"" differing in parameter type documentation":UNDEFINED
+missing-param-doc:116:0:116:14:ClassFoo:"""x"" missing in parameter documentation":UNDEFINED
+missing-type-doc:116:0:116:14:ClassFoo:"""x, y"" missing in parameter type documentation":UNDEFINED
+missing-param-doc:156:4:156:16:ClassFoo.__init__:"""x"" missing in parameter documentation":UNDEFINED
+missing-type-doc:156:4:156:16:ClassFoo.__init__:"""x, y"" missing in parameter type documentation":UNDEFINED
+missing-param-doc:172:0:172:14:ClassFoo:"""x"" missing in parameter documentation":UNDEFINED
+missing-type-doc:172:0:172:14:ClassFoo:"""x, y"" missing in parameter type documentation":UNDEFINED
+multiple-constructor-doc:172:0:172:14:ClassFoo:"""ClassFoo"" has constructor parameters documented in class and __init__":UNDEFINED
+missing-param-doc:188:4:188:16:ClassFoo.__init__:"""x"" missing in parameter documentation":UNDEFINED
+missing-type-doc:188:4:188:16:ClassFoo.__init__:"""x, y"" missing in parameter type documentation":UNDEFINED
+missing-param-doc:200:0:200:33:test_warns_missing_args_numpy:"""*args"" missing in parameter documentation":UNDEFINED
+missing-param-doc:217:0:217:35:test_warns_missing_kwargs_numpy:"""**kwargs"" missing in parameter documentation":UNDEFINED
+missing-type-doc:234:0:234:38:test_finds_args_without_type_numpy:"""untyped_arg"" missing in parameter type documentation":UNDEFINED
diff --git a/tests/functional/ext/docparams/parameter/missing_param_doc_required_Sphinx.txt b/tests/functional/ext/docparams/parameter/missing_param_doc_required_Sphinx.txt
index 7745f76199..dcc77f48ed 100644
--- a/tests/functional/ext/docparams/parameter/missing_param_doc_required_Sphinx.txt
+++ b/tests/functional/ext/docparams/parameter/missing_param_doc_required_Sphinx.txt
@@ -1,37 +1,37 @@
-missing-param-doc:8:0:18:8:test_missing_func_params_in_sphinx_docstring:"""y"" missing in parameter documentation":UNDEFINED
-missing-type-doc:8:0:18:8:test_missing_func_params_in_sphinx_docstring:"""x, y"" missing in parameter type documentation":UNDEFINED
-missing-param-doc:22:4:32:12:Foo.test_missing_method_params_in_sphinx_docstring:"""y"" missing in parameter documentation":UNDEFINED
-missing-type-doc:22:4:32:12:Foo.test_missing_method_params_in_sphinx_docstring:"""x, y"" missing in parameter type documentation":UNDEFINED
-differing-param-doc:55:0:69:22:test_wrong_name_of_func_params_in_sphinx_docstring:"""xarg1, zarg1"" differing in parameter documentation":UNDEFINED
-differing-type-doc:55:0:69:22:test_wrong_name_of_func_params_in_sphinx_docstring:"""yarg1, zarg1"" differing in parameter type documentation":UNDEFINED
-missing-param-doc:55:0:69:22:test_wrong_name_of_func_params_in_sphinx_docstring:"""xarg, zarg"" missing in parameter documentation":UNDEFINED
-missing-type-doc:55:0:69:22:test_wrong_name_of_func_params_in_sphinx_docstring:"""yarg, zarg"" missing in parameter type documentation":UNDEFINED
-differing-param-doc:72:0:83:22:test_wrong_name_of_func_params_in_sphinx_docstring_two:"""yarg1"" differing in parameter documentation":UNDEFINED
-differing-type-doc:72:0:83:22:test_wrong_name_of_func_params_in_sphinx_docstring_two:"""yarg1"" differing in parameter type documentation":UNDEFINED
-missing-param-doc:99:0:112:12:ClassFoo:"""x"" missing in parameter documentation":UNDEFINED
-missing-type-doc:99:0:112:12:ClassFoo:"""x, y"" missing in parameter type documentation":UNDEFINED
-missing-param-doc:116:4:128:12:ClassFoo.__init__:"""x"" missing in parameter documentation":UNDEFINED
-missing-type-doc:116:4:128:12:ClassFoo.__init__:"""x, y"" missing in parameter type documentation":UNDEFINED
-missing-param-doc:131:0:151:12:ClassFoo:"""x"" missing in parameter documentation":UNDEFINED
-missing-type-doc:131:0:151:12:ClassFoo:"""x, y"" missing in parameter type documentation":UNDEFINED
-multiple-constructor-doc:131:0:151:12:ClassFoo:"""ClassFoo"" has constructor parameters documented in class and __init__":UNDEFINED
-missing-param-doc:144:4:151:12:ClassFoo.__init__:"""x"" missing in parameter documentation":UNDEFINED
-missing-type-doc:144:4:151:12:ClassFoo.__init__:"""x, y"" missing in parameter type documentation":UNDEFINED
-inconsistent-return-statements:154:0:166:24:test_warns_missing_args_sphinx:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-missing-param-doc:154:0:166:24:test_warns_missing_args_sphinx:"""*args"" missing in parameter documentation":UNDEFINED
-inconsistent-return-statements:169:0:181:24:test_warns_missing_kwargs_sphinx:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-missing-param-doc:169:0:181:24:test_warns_missing_kwargs_sphinx:"""**kwargs"" missing in parameter documentation":UNDEFINED
-inconsistent-return-statements:184:0:198:24:test_finds_args_without_type_sphinx:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-missing-param-doc:184:0:198:24:test_finds_args_without_type_sphinx:"""*args"" missing in parameter documentation":UNDEFINED
-inconsistent-return-statements:201:0:215:24:test_finds_kwargs_without_type_sphinx:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-missing-param-doc:201:0:215:24:test_finds_kwargs_without_type_sphinx:"""**kwargs"" missing in parameter documentation":UNDEFINED
-inconsistent-return-statements:218:0:234:24:test_finds_args_without_type_sphinx:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-inconsistent-return-statements:237:0:253:24:test_finds_kwargs_without_type_sphinx:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-missing-raises-doc:263:4:268:17:Foo.foo:"""AttributeError"" not documented as being raised":UNDEFINED
+missing-param-doc:8:0:8:48:test_missing_func_params_in_sphinx_docstring:"""y"" missing in parameter documentation":UNDEFINED
+missing-type-doc:8:0:8:48:test_missing_func_params_in_sphinx_docstring:"""x, y"" missing in parameter type documentation":UNDEFINED
+missing-param-doc:22:4:22:54:Foo.test_missing_method_params_in_sphinx_docstring:"""y"" missing in parameter documentation":UNDEFINED
+missing-type-doc:22:4:22:54:Foo.test_missing_method_params_in_sphinx_docstring:"""x, y"" missing in parameter type documentation":UNDEFINED
+differing-param-doc:55:0:55:54:test_wrong_name_of_func_params_in_sphinx_docstring:"""xarg1, zarg1"" differing in parameter documentation":UNDEFINED
+differing-type-doc:55:0:55:54:test_wrong_name_of_func_params_in_sphinx_docstring:"""yarg1, zarg1"" differing in parameter type documentation":UNDEFINED
+missing-param-doc:55:0:55:54:test_wrong_name_of_func_params_in_sphinx_docstring:"""xarg, zarg"" missing in parameter documentation":UNDEFINED
+missing-type-doc:55:0:55:54:test_wrong_name_of_func_params_in_sphinx_docstring:"""yarg, zarg"" missing in parameter type documentation":UNDEFINED
+differing-param-doc:72:0:72:58:test_wrong_name_of_func_params_in_sphinx_docstring_two:"""yarg1"" differing in parameter documentation":UNDEFINED
+differing-type-doc:72:0:72:58:test_wrong_name_of_func_params_in_sphinx_docstring_two:"""yarg1"" differing in parameter type documentation":UNDEFINED
+missing-param-doc:99:0:99:14:ClassFoo:"""x"" missing in parameter documentation":UNDEFINED
+missing-type-doc:99:0:99:14:ClassFoo:"""x, y"" missing in parameter type documentation":UNDEFINED
+missing-param-doc:116:4:116:16:ClassFoo.__init__:"""x"" missing in parameter documentation":UNDEFINED
+missing-type-doc:116:4:116:16:ClassFoo.__init__:"""x, y"" missing in parameter type documentation":UNDEFINED
+missing-param-doc:131:0:131:14:ClassFoo:"""x"" missing in parameter documentation":UNDEFINED
+missing-type-doc:131:0:131:14:ClassFoo:"""x, y"" missing in parameter type documentation":UNDEFINED
+multiple-constructor-doc:131:0:131:14:ClassFoo:"""ClassFoo"" has constructor parameters documented in class and __init__":UNDEFINED
+missing-param-doc:144:4:144:16:ClassFoo.__init__:"""x"" missing in parameter documentation":UNDEFINED
+missing-type-doc:144:4:144:16:ClassFoo.__init__:"""x, y"" missing in parameter type documentation":UNDEFINED
+inconsistent-return-statements:154:0:154:34:test_warns_missing_args_sphinx:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+missing-param-doc:154:0:154:34:test_warns_missing_args_sphinx:"""*args"" missing in parameter documentation":UNDEFINED
+inconsistent-return-statements:169:0:169:36:test_warns_missing_kwargs_sphinx:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+missing-param-doc:169:0:169:36:test_warns_missing_kwargs_sphinx:"""**kwargs"" missing in parameter documentation":UNDEFINED
+inconsistent-return-statements:184:0:184:39:test_finds_args_without_type_sphinx:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+missing-param-doc:184:0:184:39:test_finds_args_without_type_sphinx:"""*args"" missing in parameter documentation":UNDEFINED
+inconsistent-return-statements:201:0:201:41:test_finds_kwargs_without_type_sphinx:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+missing-param-doc:201:0:201:41:test_finds_kwargs_without_type_sphinx:"""**kwargs"" missing in parameter documentation":UNDEFINED
+inconsistent-return-statements:218:0:218:39:test_finds_args_without_type_sphinx:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+inconsistent-return-statements:237:0:237:41:test_finds_kwargs_without_type_sphinx:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+missing-raises-doc:263:4:263:11:Foo.foo:"""AttributeError"" not documented as being raised":UNDEFINED
 unreachable:289:8:289:17:Foo.foo:Unreachable code:UNDEFINED
-missing-param-doc:292:4:297:30:Foo.foo:"""value"" missing in parameter documentation":UNDEFINED
-missing-raises-doc:292:4:297:30:Foo.foo:"""AttributeError"" not documented as being raised":UNDEFINED
-missing-type-doc:292:4:297:30:Foo.foo:"""value"" missing in parameter type documentation":UNDEFINED
+missing-param-doc:292:4:292:11:Foo.foo:"""value"" missing in parameter documentation":UNDEFINED
+missing-raises-doc:292:4:292:11:Foo.foo:"""AttributeError"" not documented as being raised":UNDEFINED
+missing-type-doc:292:4:292:11:Foo.foo:"""value"" missing in parameter type documentation":UNDEFINED
 unreachable:328:8:328:17:Foo.foo:Unreachable code:UNDEFINED
-useless-param-doc:332:4:346:12:Foo.test_useless_docs_ignored_argument_names_sphinx:"""_, _ignored"" useless ignored parameter documentation":UNDEFINED
-useless-type-doc:332:4:346:12:Foo.test_useless_docs_ignored_argument_names_sphinx:"""_"" useless ignored parameter type documentation":UNDEFINED
+useless-param-doc:332:4:332:55:Foo.test_useless_docs_ignored_argument_names_sphinx:"""_, _ignored"" useless ignored parameter documentation":UNDEFINED
+useless-type-doc:332:4:332:55:Foo.test_useless_docs_ignored_argument_names_sphinx:"""_"" useless ignored parameter type documentation":UNDEFINED
diff --git a/tests/functional/ext/docparams/parameter/missing_param_doc_required_min_length.txt b/tests/functional/ext/docparams/parameter/missing_param_doc_required_min_length.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_check_init.txt b/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_check_init.txt
index 7cebb0a3cd..7b30afcb55 100644
--- a/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_check_init.txt
+++ b/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_check_init.txt
@@ -1 +1 @@
-missing-param-doc:10:4:13:11:MyClass.__init__:"""my_param"" missing in parameter documentation":UNDEFINED
+missing-param-doc:10:4:10:16:MyClass.__init__:"""my_param"" missing in parameter documentation":UNDEFINED
diff --git a/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_check_none.txt b/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_check_none.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_default.txt b/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_default.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_test_all.txt b/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_test_all.txt
index d79aa94dd5..d42bc96251 100644
--- a/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_test_all.txt
+++ b/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_test_all.txt
@@ -1 +1 @@
-missing-param-doc:25:4:28:11:MyClass.__init__:"""my_param"" missing in parameter documentation":UNDEFINED
+missing-param-doc:25:4:25:16:MyClass.__init__:"""my_param"" missing in parameter documentation":UNDEFINED
diff --git a/tests/functional/ext/docparams/raise/missing_raises_doc.txt b/tests/functional/ext/docparams/raise/missing_raises_doc.txt
index 6da4d57be8..7a93e4b1cd 100644
--- a/tests/functional/ext/docparams/raise/missing_raises_doc.txt
+++ b/tests/functional/ext/docparams/raise/missing_raises_doc.txt
@@ -1,4 +1,4 @@
 unreachable:25:4:25:25:test_ignores_raise_uninferable:Unreachable code:UNDEFINED
-missing-raises-doc:28:0:42:25:test_ignores_returns_from_inner_functions:"""RuntimeError"" not documented as being raised":UNDEFINED
+missing-raises-doc:28:0:28:45:test_ignores_returns_from_inner_functions:"""RuntimeError"" not documented as being raised":UNDEFINED
 unreachable:42:4:42:25:test_ignores_returns_from_inner_functions:Unreachable code:UNDEFINED
 raising-bad-type:54:4:54:22:test_ignores_returns_use_only_names:Raising int while only classes or instances are allowed:UNDEFINED
diff --git a/tests/functional/ext/docparams/raise/missing_raises_doc_Google.txt b/tests/functional/ext/docparams/raise/missing_raises_doc_Google.txt
index 0ac9505593..6e98f05d9c 100644
--- a/tests/functional/ext/docparams/raise/missing_raises_doc_Google.txt
+++ b/tests/functional/ext/docparams/raise/missing_raises_doc_Google.txt
@@ -1,14 +1,14 @@
-missing-raises-doc:6:0:13:25:test_find_missing_google_raises:"""RuntimeError"" not documented as being raised":UNDEFINED
+missing-raises-doc:6:0:6:35:test_find_missing_google_raises:"""RuntimeError"" not documented as being raised":UNDEFINED
 unreachable:13:4:13:25:test_find_missing_google_raises:Unreachable code:UNDEFINED
-missing-raises-doc:38:0:46:21:test_find_valid_missing_google_attr_raises:"""error"" not documented as being raised":UNDEFINED
+missing-raises-doc:38:0:38:46:test_find_valid_missing_google_attr_raises:"""error"" not documented as being raised":UNDEFINED
 unreachable:83:4:83:25:test_find_all_google_raises:Unreachable code:UNDEFINED
 unreachable:94:4:94:25:test_find_multiple_google_raises:Unreachable code:UNDEFINED
 unreachable:95:4:95:30:test_find_multiple_google_raises:Unreachable code:UNDEFINED
 unreachable:96:4:96:27:test_find_multiple_google_raises:Unreachable code:UNDEFINED
-missing-raises-doc:99:0:110:25:test_find_rethrown_google_raises:"""RuntimeError"" not documented as being raised":UNDEFINED
-missing-raises-doc:113:0:124:25:test_find_rethrown_google_multiple_raises:"""RuntimeError, ValueError"" not documented as being raised":UNDEFINED
-missing-raises-doc:148:4:158:17:Foo.foo_method:"""AttributeError"" not documented as being raised":UNDEFINED
+missing-raises-doc:99:0:99:36:test_find_rethrown_google_raises:"""RuntimeError"" not documented as being raised":UNDEFINED
+missing-raises-doc:113:0:113:45:test_find_rethrown_google_multiple_raises:"""RuntimeError, ValueError"" not documented as being raised":UNDEFINED
+missing-raises-doc:148:4:148:18:Foo.foo_method:"""AttributeError"" not documented as being raised":UNDEFINED
 unreachable:158:8:158:17:Foo.foo_method:Unreachable code:UNDEFINED
 unreachable:180:8:180:17:Foo.foo_method:Unreachable code:UNDEFINED
-missing-raises-doc:183:4:192:28:Foo.foo_method:"""AttributeError"" not documented as being raised":UNDEFINED
+missing-raises-doc:183:4:183:18:Foo.foo_method:"""AttributeError"" not documented as being raised":UNDEFINED
 using-constant-test:190:8:191:34:Foo.foo_method:Using a conditional statement with a constant value:UNDEFINED
diff --git a/tests/functional/ext/docparams/raise/missing_raises_doc_Numpy.txt b/tests/functional/ext/docparams/raise/missing_raises_doc_Numpy.txt
index 8e63c4d9be..91002c02df 100644
--- a/tests/functional/ext/docparams/raise/missing_raises_doc_Numpy.txt
+++ b/tests/functional/ext/docparams/raise/missing_raises_doc_Numpy.txt
@@ -1,11 +1,11 @@
-missing-raises-doc:11:0:20:25:test_find_missing_numpy_raises:"""RuntimeError"" not documented as being raised":UNDEFINED
+missing-raises-doc:11:0:11:34:test_find_missing_numpy_raises:"""RuntimeError"" not documented as being raised":UNDEFINED
 unreachable:20:4:20:25:test_find_missing_numpy_raises:Unreachable code:UNDEFINED
 unreachable:34:4:34:25:test_find_all_numpy_raises:Unreachable code:UNDEFINED
-missing-raises-doc:37:0:50:25:test_find_rethrown_numpy_raises:"""RuntimeError"" not documented as being raised":UNDEFINED
-missing-raises-doc:53:0:66:25:test_find_rethrown_numpy_multiple_raises:"""RuntimeError, ValueError"" not documented as being raised":UNDEFINED
-missing-raises-doc:111:0:121:21:test_find_valid_missing_numpy_attr_raises:"""error"" not documented as being raised":UNDEFINED
-missing-raises-doc:146:4:158:17:Foo.foo:"""AttributeError"" not documented as being raised":UNDEFINED
+missing-raises-doc:37:0:37:35:test_find_rethrown_numpy_raises:"""RuntimeError"" not documented as being raised":UNDEFINED
+missing-raises-doc:53:0:53:44:test_find_rethrown_numpy_multiple_raises:"""RuntimeError, ValueError"" not documented as being raised":UNDEFINED
+missing-raises-doc:111:0:111:45:test_find_valid_missing_numpy_attr_raises:"""error"" not documented as being raised":UNDEFINED
+missing-raises-doc:146:4:146:11:Foo.foo:"""AttributeError"" not documented as being raised":UNDEFINED
 unreachable:158:8:158:17:Foo.foo:Unreachable code:UNDEFINED
 unreachable:182:8:182:17:Foo.foo:Unreachable code:UNDEFINED
-missing-raises-doc:185:4:196:28:Foo.foo:"""AttributeError"" not documented as being raised":UNDEFINED
+missing-raises-doc:185:4:185:11:Foo.foo:"""AttributeError"" not documented as being raised":UNDEFINED
 unreachable:215:8:215:17:Foo.foo:Unreachable code:UNDEFINED
diff --git a/tests/functional/ext/docparams/raise/missing_raises_doc_Sphinx.txt b/tests/functional/ext/docparams/raise/missing_raises_doc_Sphinx.txt
index 77dbea7080..20c2b4d380 100644
--- a/tests/functional/ext/docparams/raise/missing_raises_doc_Sphinx.txt
+++ b/tests/functional/ext/docparams/raise/missing_raises_doc_Sphinx.txt
@@ -1,13 +1,13 @@
-missing-raises-doc:7:0:13:25:test_find_missing_sphinx_raises:"""RuntimeError"" not documented as being raised":UNDEFINED
+missing-raises-doc:7:0:7:35:test_find_missing_sphinx_raises:"""RuntimeError"" not documented as being raised":UNDEFINED
 unreachable:13:4:13:25:test_find_missing_sphinx_raises:Unreachable code:UNDEFINED
 unreachable:36:4:36:25:test_find_all_sphinx_raises:Unreachable code:UNDEFINED
 unreachable:37:4:37:30:test_find_all_sphinx_raises:Unreachable code:UNDEFINED
 unreachable:38:4:38:27:test_find_all_sphinx_raises:Unreachable code:UNDEFINED
 unreachable:48:4:48:25:test_find_multiple_sphinx_raises:Unreachable code:UNDEFINED
-missing-raises-doc:51:0:61:25:test_finds_rethrown_sphinx_raises:"""RuntimeError"" not documented as being raised":UNDEFINED
-missing-raises-doc:64:0:74:25:test_finds_rethrown_sphinx_multiple_raises:"""RuntimeError, ValueError"" not documented as being raised":UNDEFINED
-missing-raises-doc:90:0:97:25:test_find_missing_sphinx_raises_infer_from_instance:"""RuntimeError"" not documented as being raised":UNDEFINED
+missing-raises-doc:51:0:51:37:test_finds_rethrown_sphinx_raises:"""RuntimeError"" not documented as being raised":UNDEFINED
+missing-raises-doc:64:0:64:46:test_finds_rethrown_sphinx_multiple_raises:"""RuntimeError, ValueError"" not documented as being raised":UNDEFINED
+missing-raises-doc:90:0:90:55:test_find_missing_sphinx_raises_infer_from_instance:"""RuntimeError"" not documented as being raised":UNDEFINED
 unreachable:97:4:97:25:test_find_missing_sphinx_raises_infer_from_instance:Unreachable code:UNDEFINED
-missing-raises-doc:100:0:110:25:test_find_missing_sphinx_raises_infer_from_function:"""RuntimeError"" not documented as being raised":UNDEFINED
+missing-raises-doc:100:0:100:55:test_find_missing_sphinx_raises_infer_from_function:"""RuntimeError"" not documented as being raised":UNDEFINED
 unreachable:110:4:110:25:test_find_missing_sphinx_raises_infer_from_function:Unreachable code:UNDEFINED
-missing-raises-doc:133:0:140:21:test_find_valid_missing_sphinx_attr_raises:"""error"" not documented as being raised":UNDEFINED
+missing-raises-doc:133:0:133:46:test_find_valid_missing_sphinx_attr_raises:"""error"" not documented as being raised":UNDEFINED
diff --git a/tests/functional/ext/docparams/raise/missing_raises_doc_required.txt b/tests/functional/ext/docparams/raise/missing_raises_doc_required.txt
index 3c9f68e163..f04a2b9fdf 100644
--- a/tests/functional/ext/docparams/raise/missing_raises_doc_required.txt
+++ b/tests/functional/ext/docparams/raise/missing_raises_doc_required.txt
@@ -1 +1 @@
-missing-raises-doc:6:0:8:28:test_warns_unknown_style:"""RuntimeError"" not documented as being raised":UNDEFINED
+missing-raises-doc:6:0:6:28:test_warns_unknown_style:"""RuntimeError"" not documented as being raised":UNDEFINED
diff --git a/tests/functional/ext/docparams/raise/missing_raises_doc_required_Google.txt b/tests/functional/ext/docparams/raise/missing_raises_doc_required_Google.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/ext/docparams/raise/missing_raises_doc_required_Numpy.txt b/tests/functional/ext/docparams/raise/missing_raises_doc_required_Numpy.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/ext/docparams/raise/missing_raises_doc_required_Sphinx.txt b/tests/functional/ext/docparams/raise/missing_raises_doc_required_Sphinx.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/ext/docparams/raise/missing_raises_doc_required_exc_inheritance.txt b/tests/functional/ext/docparams/raise/missing_raises_doc_required_exc_inheritance.txt
index e566c8a856..e955a4aec5 100644
--- a/tests/functional/ext/docparams/raise/missing_raises_doc_required_exc_inheritance.txt
+++ b/tests/functional/ext/docparams/raise/missing_raises_doc_required_exc_inheritance.txt
@@ -1 +1 @@
-missing-raises-doc:12:0:18:25:test_find_missing_raise_for_parent:"""NameError"" not documented as being raised":UNDEFINED
+missing-raises-doc:12:0:12:38:test_find_missing_raise_for_parent:"""NameError"" not documented as being raised":UNDEFINED
diff --git a/tests/functional/ext/docparams/return/missing_return_doc.txt b/tests/functional/ext/docparams/return/missing_return_doc.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/ext/docparams/return/missing_return_doc_Google.txt b/tests/functional/ext/docparams/return/missing_return_doc_Google.txt
index ea8e81200b..836114036a 100644
--- a/tests/functional/ext/docparams/return/missing_return_doc_Google.txt
+++ b/tests/functional/ext/docparams/return/missing_return_doc_Google.txt
@@ -1,7 +1,7 @@
-redundant-returns-doc:43:0:49:15:my_func:Redundant returns documentation:UNDEFINED
-redundant-returns-doc:52:0:58:15:my_func:Redundant returns documentation:UNDEFINED
-redundant-returns-doc:61:0:67:11:my_func:Redundant returns documentation:UNDEFINED
+redundant-returns-doc:43:0:43:11:my_func:Redundant returns documentation:UNDEFINED
+redundant-returns-doc:52:0:52:11:my_func:Redundant returns documentation:UNDEFINED
+redundant-returns-doc:61:0:61:11:my_func:Redundant returns documentation:UNDEFINED
 unreachable:95:8:95:17:Foo.foo_method:Unreachable code:UNDEFINED
 unreachable:112:8:112:17:Foo.foo_method:Unreachable code:UNDEFINED
-useless-param-doc:167:4:175:12:Foo.foo_method:"""_, _ignored"" useless ignored parameter documentation":UNDEFINED
-useless-type-doc:167:4:175:12:Foo.foo_method:"""_"" useless ignored parameter type documentation":UNDEFINED
+useless-param-doc:167:4:167:18:Foo.foo_method:"""_, _ignored"" useless ignored parameter documentation":UNDEFINED
+useless-type-doc:167:4:167:18:Foo.foo_method:"""_"" useless ignored parameter type documentation":UNDEFINED
diff --git a/tests/functional/ext/docparams/return/missing_return_doc_Numpy.txt b/tests/functional/ext/docparams/return/missing_return_doc_Numpy.txt
index d137612e6e..fbcfd1287c 100644
--- a/tests/functional/ext/docparams/return/missing_return_doc_Numpy.txt
+++ b/tests/functional/ext/docparams/return/missing_return_doc_Numpy.txt
@@ -1,5 +1,5 @@
-redundant-returns-doc:62:0:70:15:my_func:Redundant returns documentation:UNDEFINED
-redundant-returns-doc:73:0:80:15:my_func:Redundant returns documentation:UNDEFINED
-redundant-returns-doc:98:0:106:11:my_func:Redundant returns documentation:UNDEFINED
-useless-param-doc:164:4:177:11:Foo.foo:"""_, _ignored"" useless ignored parameter documentation":UNDEFINED
-useless-type-doc:164:4:177:11:Foo.foo:"""_"" useless ignored parameter type documentation":UNDEFINED
+redundant-returns-doc:62:0:62:11:my_func:Redundant returns documentation:UNDEFINED
+redundant-returns-doc:73:0:73:11:my_func:Redundant returns documentation:UNDEFINED
+redundant-returns-doc:98:0:98:11:my_func:Redundant returns documentation:UNDEFINED
+useless-param-doc:164:4:164:11:Foo.foo:"""_, _ignored"" useless ignored parameter documentation":UNDEFINED
+useless-type-doc:164:4:164:11:Foo.foo:"""_"" useless ignored parameter type documentation":UNDEFINED
diff --git a/tests/functional/ext/docparams/return/missing_return_doc_Sphinx.txt b/tests/functional/ext/docparams/return/missing_return_doc_Sphinx.txt
index 604b5d0955..51d324ba7b 100644
--- a/tests/functional/ext/docparams/return/missing_return_doc_Sphinx.txt
+++ b/tests/functional/ext/docparams/return/missing_return_doc_Sphinx.txt
@@ -1,2 +1,2 @@
-redundant-returns-doc:44:0:49:15:my_func:Redundant returns documentation:UNDEFINED
-redundant-returns-doc:52:0:57:15:my_func:Redundant returns documentation:UNDEFINED
+redundant-returns-doc:44:0:44:11:my_func:Redundant returns documentation:UNDEFINED
+redundant-returns-doc:52:0:52:11:my_func:Redundant returns documentation:UNDEFINED
diff --git a/tests/functional/ext/docparams/return/missing_return_doc_required.txt b/tests/functional/ext/docparams/return/missing_return_doc_required.txt
index 29042dbaa3..8e15b91a20 100644
--- a/tests/functional/ext/docparams/return/missing_return_doc_required.txt
+++ b/tests/functional/ext/docparams/return/missing_return_doc_required.txt
@@ -1,2 +1,2 @@
-missing-return-doc:6:0:7:16:warns_no_docstring:Missing return documentation:UNDEFINED
-missing-return-type-doc:6:0:7:16:warns_no_docstring:Missing return type documentation:UNDEFINED
+missing-return-doc:6:0:6:22:warns_no_docstring:Missing return documentation:UNDEFINED
+missing-return-type-doc:6:0:6:22:warns_no_docstring:Missing return type documentation:UNDEFINED
diff --git a/tests/functional/ext/docparams/return/missing_return_doc_required_Google.txt b/tests/functional/ext/docparams/return/missing_return_doc_required_Google.txt
index aa6775f5f0..dac5ad2808 100644
--- a/tests/functional/ext/docparams/return/missing_return_doc_required_Google.txt
+++ b/tests/functional/ext/docparams/return/missing_return_doc_required_Google.txt
@@ -1,10 +1,10 @@
-missing-return-type-doc:7:0:13:16:my_func:Missing return type documentation:UNDEFINED
-missing-return-doc:16:0:22:16:my_func:Missing return documentation:UNDEFINED
-missing-return-doc:25:0:31:16:my_func:Missing return documentation:UNDEFINED
-missing-return-type-doc:25:0:31:16:my_func:Missing return type documentation:UNDEFINED
-missing-return-doc:34:0:40:29:my_func:Missing return documentation:UNDEFINED
-missing-return-type-doc:50:4:57:17:Foo.foo_method:Missing return type documentation:UNDEFINED
+missing-return-type-doc:7:0:7:11:my_func:Missing return type documentation:UNDEFINED
+missing-return-doc:16:0:16:11:my_func:Missing return documentation:UNDEFINED
+missing-return-doc:25:0:25:11:my_func:Missing return documentation:UNDEFINED
+missing-return-type-doc:25:0:25:11:my_func:Missing return type documentation:UNDEFINED
+missing-return-doc:34:0:34:11:my_func:Missing return documentation:UNDEFINED
+missing-return-type-doc:50:4:50:18:Foo.foo_method:Missing return type documentation:UNDEFINED
 unreachable:57:8:57:17:Foo.foo_method:Unreachable code:UNDEFINED
-missing-return-doc:66:4:74:17:Foo.foo_method:Missing return documentation:UNDEFINED
-missing-return-type-doc:66:4:74:17:Foo.foo_method:Missing return type documentation:UNDEFINED
+missing-return-doc:66:4:66:18:Foo.foo_method:Missing return documentation:UNDEFINED
+missing-return-type-doc:66:4:66:18:Foo.foo_method:Missing return type documentation:UNDEFINED
 unreachable:74:8:74:17:Foo.foo_method:Unreachable code:UNDEFINED
diff --git a/tests/functional/ext/docparams/return/missing_return_doc_required_Numpy.txt b/tests/functional/ext/docparams/return/missing_return_doc_required_Numpy.txt
index f3dc18f8bb..61aac4ebb6 100644
--- a/tests/functional/ext/docparams/return/missing_return_doc_required_Numpy.txt
+++ b/tests/functional/ext/docparams/return/missing_return_doc_required_Numpy.txt
@@ -1,11 +1,11 @@
-missing-return-doc:7:0:19:16:my_func:Missing return documentation:UNDEFINED
-missing-return-doc:22:0:30:16:my_func:Missing return documentation:UNDEFINED
-missing-return-type-doc:22:0:30:16:my_func:Missing return type documentation:UNDEFINED
-missing-return-doc:33:0:40:29:my_func:Missing return documentation:UNDEFINED
-missing-return-type-doc:50:4:59:17:Foo.foo_prop:Missing return type documentation:UNDEFINED
+missing-return-doc:7:0:7:11:my_func:Missing return documentation:UNDEFINED
+missing-return-doc:22:0:22:11:my_func:Missing return documentation:UNDEFINED
+missing-return-type-doc:22:0:22:11:my_func:Missing return type documentation:UNDEFINED
+missing-return-doc:33:0:33:11:my_func:Missing return documentation:UNDEFINED
+missing-return-type-doc:50:4:50:16:Foo.foo_prop:Missing return type documentation:UNDEFINED
 unreachable:59:8:59:17:Foo.foo_prop:Unreachable code:UNDEFINED
-missing-return-doc:68:4:78:17:Foo.foo_method:Missing return documentation:UNDEFINED
-missing-return-type-doc:68:4:78:17:Foo.foo_method:Missing return type documentation:UNDEFINED
+missing-return-doc:68:4:68:18:Foo.foo_method:Missing return documentation:UNDEFINED
+missing-return-type-doc:68:4:68:18:Foo.foo_method:Missing return type documentation:UNDEFINED
 unreachable:78:8:78:17:Foo.foo_method:Unreachable code:UNDEFINED
-missing-return-doc:87:4:97:17:Foo.foo_method:Missing return documentation:UNDEFINED
+missing-return-doc:87:4:87:18:Foo.foo_method:Missing return documentation:UNDEFINED
 unreachable:97:8:97:17:Foo.foo_method:Unreachable code:UNDEFINED
diff --git a/tests/functional/ext/docparams/return/missing_return_doc_required_Sphinx.txt b/tests/functional/ext/docparams/return/missing_return_doc_required_Sphinx.txt
index 0d35b88edd..f9c156e0aa 100644
--- a/tests/functional/ext/docparams/return/missing_return_doc_required_Sphinx.txt
+++ b/tests/functional/ext/docparams/return/missing_return_doc_required_Sphinx.txt
@@ -1,9 +1,9 @@
-missing-return-type-doc:8:0:13:16:my_func:Missing return type documentation:UNDEFINED
-missing-return-doc:24:0:29:16:my_func:Missing return documentation:UNDEFINED
-missing-return-doc:32:0:40:16:warn_missing_sphinx_returns:Missing return documentation:UNDEFINED
-missing-return-type-doc:32:0:40:16:warn_missing_sphinx_returns:Missing return type documentation:UNDEFINED
-missing-return-doc:43:0:48:29:my_func:Missing return documentation:UNDEFINED
-missing-return-type-doc:58:4:64:17:Foo.foo:Missing return type documentation:UNDEFINED
+missing-return-type-doc:8:0:8:11:my_func:Missing return type documentation:UNDEFINED
+missing-return-doc:24:0:24:11:my_func:Missing return documentation:UNDEFINED
+missing-return-doc:32:0:32:31:warn_missing_sphinx_returns:Missing return documentation:UNDEFINED
+missing-return-type-doc:32:0:32:31:warn_missing_sphinx_returns:Missing return type documentation:UNDEFINED
+missing-return-doc:43:0:43:11:my_func:Missing return documentation:UNDEFINED
+missing-return-type-doc:58:4:58:11:Foo.foo:Missing return type documentation:UNDEFINED
 unreachable:64:8:64:17:Foo.foo:Unreachable code:UNDEFINED
-missing-return-doc:72:4:79:17:Foo.test_ignores_non_property_return_type_sphinx:Missing return documentation:UNDEFINED
-missing-return-type-doc:72:4:79:17:Foo.test_ignores_non_property_return_type_sphinx:Missing return type documentation:UNDEFINED
+missing-return-doc:72:4:72:52:Foo.test_ignores_non_property_return_type_sphinx:Missing return documentation:UNDEFINED
+missing-return-type-doc:72:4:72:52:Foo.test_ignores_non_property_return_type_sphinx:Missing return type documentation:UNDEFINED
diff --git a/tests/functional/ext/docparams/useless_type_doc.txt b/tests/functional/ext/docparams/useless_type_doc.txt
index ae879d7f18..3408f18036 100644
--- a/tests/functional/ext/docparams/useless_type_doc.txt
+++ b/tests/functional/ext/docparams/useless_type_doc.txt
@@ -1,4 +1,4 @@
-useless-param-doc:34:0:47:11:function_useless_doc:"""_some_private_param"" useless ignored parameter documentation":UNDEFINED
-useless-type-doc:34:0:47:11:function_useless_doc:"""_some_private_param"" useless ignored parameter type documentation":UNDEFINED
-useless-param-doc:67:0:73:13:test_two:"""_new"" useless ignored parameter documentation":UNDEFINED
-useless-type-doc:67:0:73:13:test_two:"""_new"" useless ignored parameter type documentation":UNDEFINED
+useless-param-doc:34:0:34:24:function_useless_doc:"""_some_private_param"" useless ignored parameter documentation":UNDEFINED
+useless-type-doc:34:0:34:24:function_useless_doc:"""_some_private_param"" useless ignored parameter type documentation":UNDEFINED
+useless-param-doc:67:0:67:12:test_two:"""_new"" useless ignored parameter documentation":UNDEFINED
+useless-type-doc:67:0:67:12:test_two:"""_new"" useless ignored parameter type documentation":UNDEFINED
diff --git a/tests/functional/ext/docparams/yield/missing_yield_doc.txt b/tests/functional/ext/docparams/yield/missing_yield_doc.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/ext/docparams/yield/missing_yield_doc_Google.txt b/tests/functional/ext/docparams/yield/missing_yield_doc_Google.txt
index febb5f9ba2..8315f89bbc 100644
--- a/tests/functional/ext/docparams/yield/missing_yield_doc_Google.txt
+++ b/tests/functional/ext/docparams/yield/missing_yield_doc_Google.txt
@@ -1 +1 @@
-redundant-yields-doc:19:0:25:12:my_func:Redundant yields documentation:UNDEFINED
+redundant-yields-doc:19:0:19:11:my_func:Redundant yields documentation:UNDEFINED
diff --git a/tests/functional/ext/docparams/yield/missing_yield_doc_Numpy.txt b/tests/functional/ext/docparams/yield/missing_yield_doc_Numpy.txt
index b855ed84df..1324cb5dc7 100644
--- a/tests/functional/ext/docparams/yield/missing_yield_doc_Numpy.txt
+++ b/tests/functional/ext/docparams/yield/missing_yield_doc_Numpy.txt
@@ -1 +1 @@
-redundant-yields-doc:22:0:30:12:my_func:Redundant yields documentation:UNDEFINED
+redundant-yields-doc:22:0:22:11:my_func:Redundant yields documentation:UNDEFINED
diff --git a/tests/functional/ext/docparams/yield/missing_yield_doc_Sphinx.txt b/tests/functional/ext/docparams/yield/missing_yield_doc_Sphinx.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/ext/docparams/yield/missing_yield_doc_required.txt b/tests/functional/ext/docparams/yield/missing_yield_doc_required.txt
index 16a4f535c1..d9162494e4 100644
--- a/tests/functional/ext/docparams/yield/missing_yield_doc_required.txt
+++ b/tests/functional/ext/docparams/yield/missing_yield_doc_required.txt
@@ -1,2 +1,2 @@
-missing-yield-doc:6:0:7:15:my_func:Missing yield documentation:UNDEFINED
-missing-yield-type-doc:6:0:7:15:my_func:Missing yield type documentation:UNDEFINED
+missing-yield-doc:6:0:6:11:my_func:Missing yield documentation:UNDEFINED
+missing-yield-type-doc:6:0:6:11:my_func:Missing yield type documentation:UNDEFINED
diff --git a/tests/functional/ext/docparams/yield/missing_yield_doc_required_Google.txt b/tests/functional/ext/docparams/yield/missing_yield_doc_required_Google.txt
index e1d8087187..0a655a744d 100644
--- a/tests/functional/ext/docparams/yield/missing_yield_doc_required_Google.txt
+++ b/tests/functional/ext/docparams/yield/missing_yield_doc_required_Google.txt
@@ -1,5 +1,5 @@
-missing-yield-doc:34:0:40:28:my_func:Missing yield documentation:UNDEFINED
-missing-yield-type-doc:43:0:49:15:my_func:Missing yield type documentation:UNDEFINED
-missing-yield-doc:52:0:58:15:my_func:Missing yield documentation:UNDEFINED
-missing-yield-doc:61:0:67:15:my_func:Missing yield documentation:UNDEFINED
-missing-yield-type-doc:61:0:67:15:my_func:Missing yield type documentation:UNDEFINED
+missing-yield-doc:34:0:34:11:my_func:Missing yield documentation:UNDEFINED
+missing-yield-type-doc:43:0:43:11:my_func:Missing yield type documentation:UNDEFINED
+missing-yield-doc:52:0:52:11:my_func:Missing yield documentation:UNDEFINED
+missing-yield-doc:61:0:61:11:my_func:Missing yield documentation:UNDEFINED
+missing-yield-type-doc:61:0:61:11:my_func:Missing yield type documentation:UNDEFINED
diff --git a/tests/functional/ext/docparams/yield/missing_yield_doc_required_Numpy.txt b/tests/functional/ext/docparams/yield/missing_yield_doc_required_Numpy.txt
index 26e5989f46..7ca1f80b0a 100644
--- a/tests/functional/ext/docparams/yield/missing_yield_doc_required_Numpy.txt
+++ b/tests/functional/ext/docparams/yield/missing_yield_doc_required_Numpy.txt
@@ -1,3 +1,3 @@
-missing-yield-doc:40:0:47:28:my_func:Missing yield documentation:UNDEFINED
-missing-yield-doc:50:0:58:15:my_func:Missing yield documentation:UNDEFINED
-missing-yield-type-doc:50:0:58:15:my_func:Missing yield type documentation:UNDEFINED
+missing-yield-doc:40:0:40:11:my_func:Missing yield documentation:UNDEFINED
+missing-yield-doc:50:0:50:11:my_func:Missing yield documentation:UNDEFINED
+missing-yield-type-doc:50:0:50:11:my_func:Missing yield type documentation:UNDEFINED
diff --git a/tests/functional/ext/docparams/yield/missing_yield_doc_required_Sphinx.txt b/tests/functional/ext/docparams/yield/missing_yield_doc_required_Sphinx.txt
index ca4744af2a..3b1931e017 100644
--- a/tests/functional/ext/docparams/yield/missing_yield_doc_required_Sphinx.txt
+++ b/tests/functional/ext/docparams/yield/missing_yield_doc_required_Sphinx.txt
@@ -1,5 +1,5 @@
-missing-yield-doc:35:0:40:28:my_func:Missing yield documentation:UNDEFINED
-missing-yield-type-doc:43:0:48:15:my_func:Missing yield type documentation:UNDEFINED
-missing-yield-doc:51:0:56:15:my_func:Missing yield documentation:UNDEFINED
-missing-yield-doc:59:0:65:15:my_func:Missing yield documentation:UNDEFINED
-missing-yield-type-doc:59:0:65:15:my_func:Missing yield type documentation:UNDEFINED
+missing-yield-doc:35:0:35:11:my_func:Missing yield documentation:UNDEFINED
+missing-yield-type-doc:43:0:43:11:my_func:Missing yield type documentation:UNDEFINED
+missing-yield-doc:51:0:51:11:my_func:Missing yield documentation:UNDEFINED
+missing-yield-doc:59:0:59:11:my_func:Missing yield documentation:UNDEFINED
+missing-yield-type-doc:59:0:59:11:my_func:Missing yield type documentation:UNDEFINED
diff --git a/tests/functional/ext/docstyle/docstyle_first_line_empty.txt b/tests/functional/ext/docstyle/docstyle_first_line_empty.txt
index 3d1e7aa6a6..6113fffaa7 100644
--- a/tests/functional/ext/docstyle/docstyle_first_line_empty.txt
+++ b/tests/functional/ext/docstyle/docstyle_first_line_empty.txt
@@ -1,3 +1,3 @@
-docstring-first-line-empty:4:0:7:19:check_messages:First line empty in function docstring:HIGH
-docstring-first-line-empty:14:0:22:11:FFFF:First line empty in class docstring:HIGH
-docstring-first-line-empty:19:4:22:11:FFFF.method1:First line empty in method docstring:HIGH
+docstring-first-line-empty:4:0:4:18:check_messages:First line empty in function docstring:HIGH
+docstring-first-line-empty:14:0:14:10:FFFF:First line empty in class docstring:HIGH
+docstring-first-line-empty:19:4:19:15:FFFF.method1:First line empty in method docstring:HIGH
diff --git a/tests/functional/ext/docstyle/docstyle_quotes_py38.txt b/tests/functional/ext/docstyle/docstyle_quotes_py38.txt
index a158059989..a83c3ab282 100644
--- a/tests/functional/ext/docstyle/docstyle_quotes_py38.txt
+++ b/tests/functional/ext/docstyle/docstyle_quotes_py38.txt
@@ -1,4 +1,4 @@
-bad-docstring-quotes:6:4:9:11:FFFF.method1:"Bad docstring quotes in method, expected """""", given '''":HIGH
-bad-docstring-quotes:11:4:12:25:FFFF.method2:"Bad docstring quotes in method, expected """""", given """:HIGH
-bad-docstring-quotes:14:4:15:25:FFFF.method3:"Bad docstring quotes in method, expected """""", given '":HIGH
-bad-docstring-quotes:17:4:18:30:FFFF.method4:"Bad docstring quotes in method, expected """""", given '":HIGH
+bad-docstring-quotes:6:4:6:15:FFFF.method1:"Bad docstring quotes in method, expected """""", given '''":HIGH
+bad-docstring-quotes:11:4:11:15:FFFF.method2:"Bad docstring quotes in method, expected """""", given """:HIGH
+bad-docstring-quotes:14:4:14:15:FFFF.method3:"Bad docstring quotes in method, expected """""", given '":HIGH
+bad-docstring-quotes:17:4:17:15:FFFF.method4:"Bad docstring quotes in method, expected """""", given '":HIGH
diff --git a/tests/functional/ext/eq_without_hash/eq_without_hash.txt b/tests/functional/ext/eq_without_hash/eq_without_hash.txt
index b7e2dc46da..e867a5ab38 100644
--- a/tests/functional/ext/eq_without_hash/eq_without_hash.txt
+++ b/tests/functional/ext/eq_without_hash/eq_without_hash.txt
@@ -1 +1 @@
-eq-without-hash:6:0:11:62:AClass:Implementing __eq__ without also implementing __hash__:HIGH
+eq-without-hash:6:0:6:12:AClass:Implementing __eq__ without also implementing __hash__:HIGH
diff --git a/tests/functional/ext/mccabe/mccabe.txt b/tests/functional/ext/mccabe/mccabe.txt
index 9f7663e696..d031943bbd 100644
--- a/tests/functional/ext/mccabe/mccabe.txt
+++ b/tests/functional/ext/mccabe/mccabe.txt
@@ -1,15 +1,15 @@
-too-complex:9:0:11:8:f1:'f1' is too complex. The McCabe rating is 1:HIGH
-too-complex:14:0:18:12:f2:'f2' is too complex. The McCabe rating is 1:HIGH
-too-complex:21:0:28:47:f3:'f3' is too complex. The McCabe rating is 3:HIGH
-too-complex:31:0:34:16:f4:'f4' is too complex. The McCabe rating is 2:HIGH
-too-complex:37:0:42:19:f5:'f5' is too complex. The McCabe rating is 2:HIGH
-too-complex:45:0:50:16:f6:'f6' is too complex. The McCabe rating is 2:HIGH
-too-complex:53:0:65:7:f7:'f7' is too complex. The McCabe rating is 3:HIGH
-too-complex:68:0:77:16:f8:'f8' is too complex. The McCabe rating is 4:HIGH
-too-complex:80:0:103:25:f9:'f9' is too complex. The McCabe rating is 9:HIGH
-too-complex:106:0:130:16:f10:'f10' is too complex. The McCabe rating is 11:HIGH
-too-complex:138:4:140:12:MyClass1.method1:'method1' is too complex. The McCabe rating is 1:HIGH
-too-complex:142:4:195:21:MyClass1.method2:'method2' is too complex. The McCabe rating is 18:HIGH
-too-many-branches:142:4:195:21:MyClass1.method2:Too many branches (20/12):UNDEFINED
+too-complex:9:0:9:6:f1:'f1' is too complex. The McCabe rating is 1:HIGH
+too-complex:14:0:14:6:f2:'f2' is too complex. The McCabe rating is 1:HIGH
+too-complex:21:0:21:6:f3:'f3' is too complex. The McCabe rating is 3:HIGH
+too-complex:31:0:31:6:f4:'f4' is too complex. The McCabe rating is 2:HIGH
+too-complex:37:0:37:6:f5:'f5' is too complex. The McCabe rating is 2:HIGH
+too-complex:45:0:45:6:f6:'f6' is too complex. The McCabe rating is 2:HIGH
+too-complex:53:0:53:6:f7:'f7' is too complex. The McCabe rating is 3:HIGH
+too-complex:68:0:68:6:f8:'f8' is too complex. The McCabe rating is 4:HIGH
+too-complex:80:0:80:6:f9:'f9' is too complex. The McCabe rating is 9:HIGH
+too-complex:106:0:106:7:f10:'f10' is too complex. The McCabe rating is 11:HIGH
+too-complex:138:4:138:15:MyClass1.method1:'method1' is too complex. The McCabe rating is 1:HIGH
+too-complex:142:4:142:15:MyClass1.method2:'method2' is too complex. The McCabe rating is 18:HIGH
+too-many-branches:142:4:142:15:MyClass1.method2:Too many branches (20/12):UNDEFINED
 too-complex:198:0:204:15::This 'for' is too complex. The McCabe rating is 4:HIGH
-too-complex:207:0:216:15:method3:'method3' is too complex. The McCabe rating is 2:HIGH
+too-complex:207:0:207:11:method3:'method3' is too complex. The McCabe rating is 2:HIGH
diff --git a/tests/functional/ext/typing/typing_broken_callable_deprecated_alias.txt b/tests/functional/ext/typing/typing_broken_callable_deprecated_alias.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/ext/typing/typing_broken_noreturn_py372.txt b/tests/functional/ext/typing/typing_broken_noreturn_py372.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/f/fallback_import_disabled.txt b/tests/functional/f/fallback_import_disabled.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/f/first_arg.txt b/tests/functional/f/first_arg.txt
index 8517a8ad8a..e75743b33e 100644
--- a/tests/functional/f/first_arg.txt
+++ b/tests/functional/f/first_arg.txt
@@ -1,9 +1,9 @@
-bad-classmethod-argument:10:4:11:12:Obj.__new__:Class method __new__ should have 'cls' as first argument:UNDEFINED
+bad-classmethod-argument:10:4:10:15:Obj.__new__:Class method __new__ should have 'cls' as first argument:UNDEFINED
 no-classmethod-decorator:16:4:16:10:Obj:Consider using a decorator instead of calling classmethod:UNDEFINED
-bad-classmethod-argument:18:4:19:12:Obj.class2:Class method class2 should have 'cls' as first argument:UNDEFINED
+bad-classmethod-argument:18:4:18:14:Obj.class2:Class method class2 should have 'cls' as first argument:UNDEFINED
 no-classmethod-decorator:20:4:20:10:Obj:Consider using a decorator instead of calling classmethod:UNDEFINED
-bad-mcs-classmethod-argument:25:4:26:12:Meta.__new__:Metaclass class method __new__ should have 'cls' as first argument:UNDEFINED
-bad-mcs-method-argument:32:4:33:12:Meta.method2:Metaclass method method2 should have 'cls' as first argument:UNDEFINED
+bad-mcs-classmethod-argument:25:4:25:15:Meta.__new__:Metaclass class method __new__ should have 'cls' as first argument:UNDEFINED
+bad-mcs-method-argument:32:4:32:15:Meta.method2:Metaclass method method2 should have 'cls' as first argument:UNDEFINED
 no-classmethod-decorator:38:4:38:10:Meta:Consider using a decorator instead of calling classmethod:UNDEFINED
-bad-mcs-classmethod-argument:40:4:41:12:Meta.class2:Metaclass class method class2 should have 'cls' as first argument:UNDEFINED
+bad-mcs-classmethod-argument:40:4:40:14:Meta.class2:Metaclass class method class2 should have 'cls' as first argument:UNDEFINED
 no-classmethod-decorator:42:4:42:10:Meta:Consider using a decorator instead of calling classmethod:UNDEFINED
diff --git a/tests/functional/f/formatted_string_literal_with_if.txt b/tests/functional/f/formatted_string_literal_with_if.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/f/function_redefined.txt b/tests/functional/f/function_redefined.txt
index 2a538f66aa..724fe13ca1 100644
--- a/tests/functional/f/function_redefined.txt
+++ b/tests/functional/f/function_redefined.txt
@@ -1,7 +1,7 @@
-function-redefined:18:4:19:23:AAAA.method2:method already defined line 15:UNDEFINED
-function-redefined:21:0:28:17:AAAA:class already defined line 8:UNDEFINED
-function-redefined:35:0:38:23:func2:function already defined line 32:UNDEFINED
+function-redefined:18:4:18:15:AAAA.method2:method already defined line 15:UNDEFINED
+function-redefined:21:0:21:10:AAAA:class already defined line 8:UNDEFINED
+function-redefined:35:0:35:9:func2:function already defined line 32:UNDEFINED
 redefined-outer-name:37:4:37:16:func2:Redefining name '__revision__' from outer scope (line 7):UNDEFINED
-function-redefined:54:4:55:51:exclusive_func2:function already defined line 48:UNDEFINED
-function-redefined:89:0:90:8:ceil:function already defined line 88:UNDEFINED
-function-redefined:93:0:94:8:math:function already defined line 92:UNDEFINED
+function-redefined:54:4:54:23:exclusive_func2:function already defined line 48:UNDEFINED
+function-redefined:89:0:89:8:ceil:function already defined line 88:UNDEFINED
+function-redefined:93:0:93:8:math:function already defined line 92:UNDEFINED
diff --git a/tests/functional/f/function_redefined_2540.txt b/tests/functional/f/function_redefined_2540.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/f/future_import.txt b/tests/functional/f/future_import.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/g/generic_alias/generic_alias_collections.txt b/tests/functional/g/generic_alias/generic_alias_collections.txt
index 6d3914a78b..663b81abb2 100644
--- a/tests/functional/g/generic_alias/generic_alias_collections.txt
+++ b/tests/functional/g/generic_alias/generic_alias_collections.txt
@@ -1,16 +1,16 @@
 unsubscriptable-object:66:0:66:24::Value 'collections.abc.Hashable' is unsubscriptable:UNDEFINED
 unsubscriptable-object:67:0:67:21::Value 'collections.abc.Sized' is unsubscriptable:UNDEFINED
-abstract-method:74:0:75:8:DerivedHashable:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
-abstract-method:77:0:78:8:DerivedIterable:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
-abstract-method:80:0:81:8:DerivedCollection:Method '__contains__' is abstract in class 'Container' but is not overridden:UNDEFINED
-abstract-method:80:0:81:8:DerivedCollection:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
-abstract-method:80:0:81:8:DerivedCollection:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
-abstract-method:99:0:100:8:DerivedMultiple:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
-abstract-method:99:0:100:8:DerivedMultiple:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
-abstract-method:104:0:105:8:CustomAbstractCls2:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
-abstract-method:104:0:105:8:CustomAbstractCls2:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
-abstract-method:106:0:107:8:CustomImplementation:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
-abstract-method:106:0:107:8:CustomImplementation:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
+abstract-method:74:0:74:21:DerivedHashable:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
+abstract-method:77:0:77:21:DerivedIterable:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
+abstract-method:80:0:80:23:DerivedCollection:Method '__contains__' is abstract in class 'Container' but is not overridden:UNDEFINED
+abstract-method:80:0:80:23:DerivedCollection:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
+abstract-method:80:0:80:23:DerivedCollection:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
+abstract-method:99:0:99:21:DerivedMultiple:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
+abstract-method:99:0:99:21:DerivedMultiple:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
+abstract-method:104:0:104:24:CustomAbstractCls2:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
+abstract-method:104:0:104:24:CustomAbstractCls2:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
+abstract-method:106:0:106:26:CustomImplementation:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
+abstract-method:106:0:106:26:CustomImplementation:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
 unsubscriptable-object:125:9:125:12::Value 'int' is unsubscriptable:UNDEFINED
 unsubscriptable-object:126:15:126:39::Value 'collections.abc.Hashable' is unsubscriptable:UNDEFINED
 unsubscriptable-object:127:12:127:33::Value 'collections.abc.Sized' is unsubscriptable:UNDEFINED
diff --git a/tests/functional/g/generic_alias/generic_alias_mixed_py39.txt b/tests/functional/g/generic_alias/generic_alias_mixed_py39.txt
index fd5746a70c..06dbdc1976 100644
--- a/tests/functional/g/generic_alias/generic_alias_mixed_py39.txt
+++ b/tests/functional/g/generic_alias/generic_alias_mixed_py39.txt
@@ -1,5 +1,5 @@
-abstract-method:29:0:30:8:DerivedHashable:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
-abstract-method:32:0:33:8:DerivedIterable:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
-abstract-method:35:0:36:8:DerivedCollection:Method '__contains__' is abstract in class 'Container' but is not overridden:UNDEFINED
-abstract-method:35:0:36:8:DerivedCollection:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
-abstract-method:35:0:36:8:DerivedCollection:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
+abstract-method:29:0:29:21:DerivedHashable:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
+abstract-method:32:0:32:21:DerivedIterable:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
+abstract-method:35:0:35:23:DerivedCollection:Method '__contains__' is abstract in class 'Container' but is not overridden:UNDEFINED
+abstract-method:35:0:35:23:DerivedCollection:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
+abstract-method:35:0:35:23:DerivedCollection:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
diff --git a/tests/functional/g/generic_alias/generic_alias_related.txt b/tests/functional/g/generic_alias/generic_alias_related.txt
index 2d65b62137..d13f75fa76 100644
--- a/tests/functional/g/generic_alias/generic_alias_related.txt
+++ b/tests/functional/g/generic_alias/generic_alias_related.txt
@@ -2,4 +2,4 @@ unsubscriptable-object:34:0:34:20::Value 'ClsUnsubscriptable()' is unsubscriptab
 unsubscriptable-object:35:0:35:18::Value 'ClsUnsubscriptable' is unsubscriptable:UNDEFINED
 unsubscriptable-object:38:0:38:10::Value 'ClsGetItem' is unsubscriptable:UNDEFINED
 unsubscriptable-object:40:0:40:17::Value 'ClsClassGetItem()' is unsubscriptable:UNDEFINED
-abstract-method:53:0:54:8:Derived:Method 'abstract_method' is abstract in class 'ClsAbstract' but is not overridden:UNDEFINED
+abstract-method:53:0:53:13:Derived:Method 'abstract_method' is abstract in class 'ClsAbstract' but is not overridden:UNDEFINED
diff --git a/tests/functional/g/generic_alias/generic_alias_related_py39.txt b/tests/functional/g/generic_alias/generic_alias_related_py39.txt
index 295288f04d..114376f5ef 100644
--- a/tests/functional/g/generic_alias/generic_alias_related_py39.txt
+++ b/tests/functional/g/generic_alias/generic_alias_related_py39.txt
@@ -2,4 +2,4 @@ unsubscriptable-object:36:0:36:20::Value 'ClsUnsubscriptable()' is unsubscriptab
 unsubscriptable-object:37:0:37:18::Value 'ClsUnsubscriptable' is unsubscriptable:UNDEFINED
 unsubscriptable-object:40:0:40:10::Value 'ClsGetItem' is unsubscriptable:UNDEFINED
 unsubscriptable-object:42:0:42:17::Value 'ClsClassGetItem()' is unsubscriptable:UNDEFINED
-abstract-method:55:0:56:8:Derived:Method 'abstract_method' is abstract in class 'ClsAbstract' but is not overridden:UNDEFINED
+abstract-method:55:0:55:13:Derived:Method 'abstract_method' is abstract in class 'ClsAbstract' but is not overridden:UNDEFINED
diff --git a/tests/functional/g/generic_alias/generic_alias_side_effects.txt b/tests/functional/g/generic_alias/generic_alias_side_effects.txt
index 3e7548da61..b22f185ea8 100644
--- a/tests/functional/g/generic_alias/generic_alias_side_effects.txt
+++ b/tests/functional/g/generic_alias/generic_alias_side_effects.txt
@@ -1,8 +1,8 @@
-dangerous-default-value:19:0:21:16:function4:Dangerous default value set() (builtins.set) as argument:UNDEFINED
-dangerous-default-value:27:0:29:16:function7:Dangerous default value dict() (builtins.dict) as argument:UNDEFINED
-dangerous-default-value:31:0:33:16:function8:Dangerous default value list() (builtins.list) as argument:UNDEFINED
-dangerous-default-value:35:0:37:16:function17:Dangerous default value deque() (collections.deque) as argument:UNDEFINED
-dangerous-default-value:39:0:41:16:function18:Dangerous default value ChainMap() (collections.ChainMap) as argument:UNDEFINED
-dangerous-default-value:43:0:45:16:function19:Dangerous default value Counter() (collections.Counter) as argument:UNDEFINED
-dangerous-default-value:47:0:49:16:function20:Dangerous default value OrderedDict() (collections.OrderedDict) as argument:UNDEFINED
-dangerous-default-value:51:0:53:16:function21:Dangerous default value defaultdict() (collections.defaultdict) as argument:UNDEFINED
+dangerous-default-value:19:0:19:13:function4:Dangerous default value set() (builtins.set) as argument:UNDEFINED
+dangerous-default-value:27:0:27:13:function7:Dangerous default value dict() (builtins.dict) as argument:UNDEFINED
+dangerous-default-value:31:0:31:13:function8:Dangerous default value list() (builtins.list) as argument:UNDEFINED
+dangerous-default-value:35:0:35:14:function17:Dangerous default value deque() (collections.deque) as argument:UNDEFINED
+dangerous-default-value:39:0:39:14:function18:Dangerous default value ChainMap() (collections.ChainMap) as argument:UNDEFINED
+dangerous-default-value:43:0:43:14:function19:Dangerous default value Counter() (collections.Counter) as argument:UNDEFINED
+dangerous-default-value:47:0:47:14:function20:Dangerous default value OrderedDict() (collections.OrderedDict) as argument:UNDEFINED
+dangerous-default-value:51:0:51:14:function21:Dangerous default value defaultdict() (collections.defaultdict) as argument:UNDEFINED
diff --git a/tests/functional/g/generic_alias/generic_alias_typing.txt b/tests/functional/g/generic_alias/generic_alias_typing.txt
index b5cb449b88..8ed10fe10b 100644
--- a/tests/functional/g/generic_alias/generic_alias_typing.txt
+++ b/tests/functional/g/generic_alias/generic_alias_typing.txt
@@ -1,18 +1,18 @@
 unsubscriptable-object:66:0:66:17::Value 'typing.ByteString' is unsubscriptable:UNDEFINED
 unsubscriptable-object:67:0:67:15::Value 'typing.Hashable' is unsubscriptable:UNDEFINED
 unsubscriptable-object:68:0:68:12::Value 'typing.Sized' is unsubscriptable:UNDEFINED
-abstract-method:72:0:73:8:DerivedHashable:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
-abstract-method:75:0:76:8:DerivedIterable:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
-abstract-method:78:0:79:8:DerivedCollection:Method '__contains__' is abstract in class 'Container' but is not overridden:UNDEFINED
-abstract-method:78:0:79:8:DerivedCollection:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
-abstract-method:78:0:79:8:DerivedCollection:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
-abstract-method:100:0:101:8:DerivedMultiple:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
-abstract-method:100:0:101:8:DerivedMultiple:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
-abstract-method:105:0:106:8:CustomAbstractCls2:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
-abstract-method:105:0:106:8:CustomAbstractCls2:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
-abstract-method:107:0:108:8:CustomImplementation:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
-abstract-method:107:0:108:8:CustomImplementation:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
-abstract-method:118:0:119:8:DerivedIterable2:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
+abstract-method:72:0:72:21:DerivedHashable:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
+abstract-method:75:0:75:21:DerivedIterable:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
+abstract-method:78:0:78:23:DerivedCollection:Method '__contains__' is abstract in class 'Container' but is not overridden:UNDEFINED
+abstract-method:78:0:78:23:DerivedCollection:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
+abstract-method:78:0:78:23:DerivedCollection:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
+abstract-method:100:0:100:21:DerivedMultiple:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
+abstract-method:100:0:100:21:DerivedMultiple:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
+abstract-method:105:0:105:24:CustomAbstractCls2:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
+abstract-method:105:0:105:24:CustomAbstractCls2:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
+abstract-method:107:0:107:26:CustomImplementation:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
+abstract-method:107:0:107:26:CustomImplementation:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
+abstract-method:118:0:118:22:DerivedIterable2:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
 unsubscriptable-object:138:9:138:12::Value 'int' is unsubscriptable:UNDEFINED
 unsubscriptable-object:139:17:139:34::Value 'typing.ByteString' is unsubscriptable:UNDEFINED
 unsubscriptable-object:140:15:140:30::Value 'typing.Hashable' is unsubscriptable:UNDEFINED
diff --git a/tests/functional/g/genexp_in_class_scope.txt b/tests/functional/g/genexp_in_class_scope.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/i/implicit/implicit_str_concat_utf8.txt b/tests/functional/i/implicit/implicit_str_concat_utf8.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/i/inconsistent/inconsistent_mro.txt b/tests/functional/i/inconsistent/inconsistent_mro.txt
index 8760dfae6f..ea5ca14233 100644
--- a/tests/functional/i/inconsistent/inconsistent_mro.txt
+++ b/tests/functional/i/inconsistent/inconsistent_mro.txt
@@ -1 +1 @@
-inconsistent-mro:8:0:9:8:Inconsistent:Inconsistent method resolution order for class 'Inconsistent':UNDEFINED
+inconsistent-mro:8:0:8:18:Inconsistent:Inconsistent method resolution order for class 'Inconsistent':UNDEFINED
diff --git a/tests/functional/i/inconsistent/inconsistent_returns.txt b/tests/functional/i/inconsistent/inconsistent_returns.txt
index cf67b13ea2..8e67a83f8f 100644
--- a/tests/functional/i/inconsistent/inconsistent_returns.txt
+++ b/tests/functional/i/inconsistent/inconsistent_returns.txt
@@ -1,17 +1,17 @@
-inconsistent-return-statements:160:0:162:29:explicit_implicit_returns:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-inconsistent-return-statements:164:0:167:25:empty_explicit_returns:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-inconsistent-return-statements:169:0:175:19:explicit_implicit_returns2:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-inconsistent-return-statements:177:0:183:23:explicit_implicit_returns3:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-inconsistent-return-statements:185:0:193:16:returns_missing_in_catched_exceptions:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-inconsistent-return-statements:195:0:200:22:complex_func:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-inconsistent-return-statements:203:4:208:26:inconsistent_returns_in_nested_function.not_consistent_returns_inner:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-inconsistent-return-statements:211:0:215:22:bug_1771_counter_example:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-inconsistent-return-statements:229:0:235:24:bug_1772_counter_example:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-inconsistent-return-statements:237:0:244:14:bug_1794_inner_func_in_if_counter_example_1:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-inconsistent-return-statements:246:0:253:14:bug_1794_inner_func_in_if_counter_example_2:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-inconsistent-return-statements:255:0:265:18:bug_1794_inner_func_in_if_counter_example_3:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-inconsistent-return-statements:262:8:265:18:bug_1794_inner_func_in_if_counter_example_3._inner2:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-inconsistent-return-statements:267:0:275:12:bug_3468:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-inconsistent-return-statements:277:0:289:13:bug_3468_variant:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-inconsistent-return-statements:322:0:329:20:bug_pylint_3873_1:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-inconsistent-return-statements:349:0:355:15:bug_pylint_4019_wrong:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+inconsistent-return-statements:160:0:160:29:explicit_implicit_returns:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+inconsistent-return-statements:164:0:164:26:empty_explicit_returns:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+inconsistent-return-statements:169:0:169:30:explicit_implicit_returns2:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+inconsistent-return-statements:177:0:177:30:explicit_implicit_returns3:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+inconsistent-return-statements:185:0:185:41:returns_missing_in_catched_exceptions:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+inconsistent-return-statements:195:0:195:16:complex_func:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+inconsistent-return-statements:203:4:203:36:inconsistent_returns_in_nested_function.not_consistent_returns_inner:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+inconsistent-return-statements:211:0:211:28:bug_1771_counter_example:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+inconsistent-return-statements:229:0:229:28:bug_1772_counter_example:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+inconsistent-return-statements:237:0:237:47:bug_1794_inner_func_in_if_counter_example_1:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+inconsistent-return-statements:246:0:246:47:bug_1794_inner_func_in_if_counter_example_2:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+inconsistent-return-statements:255:0:255:47:bug_1794_inner_func_in_if_counter_example_3:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+inconsistent-return-statements:262:8:262:19:bug_1794_inner_func_in_if_counter_example_3._inner2:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+inconsistent-return-statements:267:0:267:12:bug_3468:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+inconsistent-return-statements:277:0:277:20:bug_3468_variant:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+inconsistent-return-statements:322:0:322:21:bug_pylint_3873_1:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+inconsistent-return-statements:349:0:349:25:bug_pylint_4019_wrong:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
diff --git a/tests/functional/i/inconsistent/inconsistent_returns_noreturn.txt b/tests/functional/i/inconsistent/inconsistent_returns_noreturn.txt
index 8e36f5b59d..0e3ca50745 100644
--- a/tests/functional/i/inconsistent/inconsistent_returns_noreturn.txt
+++ b/tests/functional/i/inconsistent/inconsistent_returns_noreturn.txt
@@ -1 +1 @@
-inconsistent-return-statements:32:0:42:44:bug_pylint_4122_wrong:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+inconsistent-return-statements:32:0:32:25:bug_pylint_4122_wrong:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
diff --git a/tests/functional/i/inherit_non_class.txt b/tests/functional/i/inherit_non_class.txt
index da0f55df72..4f90838329 100644
--- a/tests/functional/i/inherit_non_class.txt
+++ b/tests/functional/i/inherit_non_class.txt
@@ -1,11 +1,11 @@
-inherit-non-class:21:0:22:40:Bad:Inheriting '1', which is not a class.:UNDEFINED
-inherit-non-class:24:0:25:38:Bad1:"Inheriting 'lambda abc: 42', which is not a class.":UNDEFINED
-inherit-non-class:27:0:28:53:Bad2:Inheriting 'object()', which is not a class.:UNDEFINED
-inherit-non-class:30:0:31:40:Bad3:Inheriting 'return_class', which is not a class.:UNDEFINED
-inherit-non-class:33:0:34:40:Bad4:Inheriting 'Empty()', which is not a class.:UNDEFINED
-inherit-non-class:68:0:69:8:NotInheritableBool:Inheriting 'bool', which is not a class.:UNDEFINED
-inherit-non-class:72:0:73:8:NotInheritableRange:Inheriting 'range', which is not a class.:UNDEFINED
-inherit-non-class:76:0:77:8:NotInheritableSlice:Inheriting 'slice', which is not a class.:UNDEFINED
-inherit-non-class:80:0:81:8:NotInheritableMemoryView:Inheriting 'memoryview', which is not a class.:UNDEFINED
-inherit-non-class:99:0:100:8:Child2:Inheriting 'ParentBad[int]', which is not a class.:UNDEFINED
+inherit-non-class:21:0:21:9:Bad:Inheriting '1', which is not a class.:UNDEFINED
+inherit-non-class:24:0:24:10:Bad1:"Inheriting 'lambda abc: 42', which is not a class.":UNDEFINED
+inherit-non-class:27:0:27:10:Bad2:Inheriting 'object()', which is not a class.:UNDEFINED
+inherit-non-class:30:0:30:10:Bad3:Inheriting 'return_class', which is not a class.:UNDEFINED
+inherit-non-class:33:0:33:10:Bad4:Inheriting 'Empty()', which is not a class.:UNDEFINED
+inherit-non-class:68:0:68:24:NotInheritableBool:Inheriting 'bool', which is not a class.:UNDEFINED
+inherit-non-class:72:0:72:25:NotInheritableRange:Inheriting 'range', which is not a class.:UNDEFINED
+inherit-non-class:76:0:76:25:NotInheritableSlice:Inheriting 'slice', which is not a class.:UNDEFINED
+inherit-non-class:80:0:80:30:NotInheritableMemoryView:Inheriting 'memoryview', which is not a class.:UNDEFINED
+inherit-non-class:99:0:99:12:Child2:Inheriting 'ParentBad[int]', which is not a class.:UNDEFINED
 unsubscriptable-object:103:13:103:18:Child3:Value 'Empty' is unsubscriptable:UNDEFINED
diff --git a/tests/functional/i/init_is_generator.txt b/tests/functional/i/init_is_generator.txt
index 3566e6f585..789e322e87 100644
--- a/tests/functional/i/init_is_generator.txt
+++ b/tests/functional/i/init_is_generator.txt
@@ -1 +1 @@
-init-is-generator:4:4:5:18:SomeClass.__init__:__init__ method is a generator:UNDEFINED
+init-is-generator:4:4:4:16:SomeClass.__init__:__init__ method is a generator:UNDEFINED
diff --git a/tests/functional/i/init_not_called.txt b/tests/functional/i/init_not_called.txt
index f1779a26a0..ae5e8f91fa 100644
--- a/tests/functional/i/init_not_called.txt
+++ b/tests/functional/i/init_not_called.txt
@@ -1,2 +1,2 @@
-super-init-not-called:25:4:26:27:ZZZZ.__init__:__init__ method from base class 'BBBB' is not called:INFERENCE
-super-init-not-called:58:4:59:20:AssignedInit.__init__:__init__ method from base class 'NewStyleC' is not called:INFERENCE
+super-init-not-called:25:4:25:16:ZZZZ.__init__:__init__ method from base class 'BBBB' is not called:INFERENCE
+super-init-not-called:58:4:58:16:AssignedInit.__init__:__init__ method from base class 'NewStyleC' is not called:INFERENCE
diff --git a/tests/functional/i/init_return_from_inner_function.txt b/tests/functional/i/init_return_from_inner_function.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/i/init_subclass_classmethod.txt b/tests/functional/i/init_subclass_classmethod.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/i/inner_classes.txt b/tests/functional/i/inner_classes.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/i/invalid/invalid_all_format_valid_1.txt b/tests/functional/i/invalid/invalid_all_format_valid_1.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/i/invalid/invalid_all_format_valid_2.txt b/tests/functional/i/invalid/invalid_all_format_valid_2.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/i/invalid/invalid_all_format_valid_3.txt b/tests/functional/i/invalid/invalid_all_format_valid_3.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/i/invalid/invalid_all_format_valid_4.txt b/tests/functional/i/invalid/invalid_all_format_valid_4.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/i/invalid/invalid_all_format_valid_5.txt b/tests/functional/i/invalid/invalid_all_format_valid_5.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/i/invalid/invalid_all_format_valid_6.txt b/tests/functional/i/invalid/invalid_all_format_valid_6.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/i/invalid/invalid_bool_returned.txt b/tests/functional/i/invalid/invalid_bool_returned.txt
index 616209139a..f8c6fc125f 100644
--- a/tests/functional/i/invalid/invalid_bool_returned.txt
+++ b/tests/functional/i/invalid/invalid_bool_returned.txt
@@ -1,3 +1,3 @@
-invalid-bool-returned:36:4:37:16:FirstBadBool.__bool__:__bool__ does not return bool:UNDEFINED
-invalid-bool-returned:43:4:44:21:SecondBadBool.__bool__:__bool__ does not return bool:UNDEFINED
-invalid-bool-returned:50:4:51:24:ThirdBadBool.__bool__:__bool__ does not return bool:UNDEFINED
+invalid-bool-returned:36:4:36:16:FirstBadBool.__bool__:__bool__ does not return bool:UNDEFINED
+invalid-bool-returned:43:4:43:16:SecondBadBool.__bool__:__bool__ does not return bool:UNDEFINED
+invalid-bool-returned:50:4:50:16:ThirdBadBool.__bool__:__bool__ does not return bool:UNDEFINED
diff --git a/tests/functional/i/invalid/invalid_bytes_returned.txt b/tests/functional/i/invalid/invalid_bytes_returned.txt
index 9d8f0ece69..c05ea92939 100644
--- a/tests/functional/i/invalid/invalid_bytes_returned.txt
+++ b/tests/functional/i/invalid/invalid_bytes_returned.txt
@@ -1,3 +1,3 @@
-invalid-bytes-returned:36:4:37:20:FirstBadBytes.__bytes__:__bytes__ does not return bytes:UNDEFINED
-invalid-bytes-returned:43:4:44:16:SecondBadBytes.__bytes__:__bytes__ does not return bytes:UNDEFINED
-invalid-bytes-returned:50:4:51:36:ThirdBadBytes.__bytes__:__bytes__ does not return bytes:UNDEFINED
+invalid-bytes-returned:36:4:36:17:FirstBadBytes.__bytes__:__bytes__ does not return bytes:UNDEFINED
+invalid-bytes-returned:43:4:43:17:SecondBadBytes.__bytes__:__bytes__ does not return bytes:UNDEFINED
+invalid-bytes-returned:50:4:50:17:ThirdBadBytes.__bytes__:__bytes__ does not return bytes:UNDEFINED
diff --git a/tests/functional/i/invalid/invalid_format_returned.txt b/tests/functional/i/invalid/invalid_format_returned.txt
index fc753eab3c..17ebefc960 100644
--- a/tests/functional/i/invalid/invalid_format_returned.txt
+++ b/tests/functional/i/invalid/invalid_format_returned.txt
@@ -1,3 +1,3 @@
-invalid-format-returned:36:4:37:21:FirstBadFormat.__format__:__format__ does not return str:UNDEFINED
-invalid-format-returned:43:4:44:16:SecondBadFormat.__format__:__format__ does not return str:UNDEFINED
-invalid-format-returned:50:4:51:36:ThirdBadFormat.__format__:__format__ does not return str:UNDEFINED
+invalid-format-returned:36:4:36:18:FirstBadFormat.__format__:__format__ does not return str:UNDEFINED
+invalid-format-returned:43:4:43:18:SecondBadFormat.__format__:__format__ does not return str:UNDEFINED
+invalid-format-returned:50:4:50:18:ThirdBadFormat.__format__:__format__ does not return str:UNDEFINED
diff --git a/tests/functional/i/invalid/invalid_getnewargs/invalid_getnewargs_ex_returned.txt b/tests/functional/i/invalid/invalid_getnewargs/invalid_getnewargs_ex_returned.txt
index 198808e79e..b657c5f40b 100644
--- a/tests/functional/i/invalid/invalid_getnewargs/invalid_getnewargs_ex_returned.txt
+++ b/tests/functional/i/invalid/invalid_getnewargs/invalid_getnewargs_ex_returned.txt
@@ -1,6 +1,6 @@
-invalid-getnewargs-ex-returned:36:4:37:16:FirstBadGetNewArgsEx.__getnewargs_ex__:__getnewargs_ex__ does not return a tuple containing (tuple, dict):UNDEFINED
-invalid-getnewargs-ex-returned:43:4:44:41:SecondBadGetNewArgsEx.__getnewargs_ex__:__getnewargs_ex__ does not return a tuple containing (tuple, dict):UNDEFINED
-invalid-getnewargs-ex-returned:50:4:51:41:ThirdBadGetNewArgsEx.__getnewargs_ex__:__getnewargs_ex__ does not return a tuple containing (tuple, dict):UNDEFINED
-invalid-getnewargs-ex-returned:57:4:58:29:FourthBadGetNewArgsEx.__getnewargs_ex__:__getnewargs_ex__ does not return a tuple containing (tuple, dict):UNDEFINED
-invalid-getnewargs-ex-returned:64:4:65:33:FifthBadGetNewArgsEx.__getnewargs_ex__:__getnewargs_ex__ does not return a tuple containing (tuple, dict):UNDEFINED
-invalid-getnewargs-ex-returned:71:4:72:29:SixthBadGetNewArgsEx.__getnewargs_ex__:__getnewargs_ex__ does not return a tuple containing (tuple, dict):UNDEFINED
+invalid-getnewargs-ex-returned:36:4:36:25:FirstBadGetNewArgsEx.__getnewargs_ex__:__getnewargs_ex__ does not return a tuple containing (tuple, dict):UNDEFINED
+invalid-getnewargs-ex-returned:43:4:43:25:SecondBadGetNewArgsEx.__getnewargs_ex__:__getnewargs_ex__ does not return a tuple containing (tuple, dict):UNDEFINED
+invalid-getnewargs-ex-returned:50:4:50:25:ThirdBadGetNewArgsEx.__getnewargs_ex__:__getnewargs_ex__ does not return a tuple containing (tuple, dict):UNDEFINED
+invalid-getnewargs-ex-returned:57:4:57:25:FourthBadGetNewArgsEx.__getnewargs_ex__:__getnewargs_ex__ does not return a tuple containing (tuple, dict):UNDEFINED
+invalid-getnewargs-ex-returned:64:4:64:25:FifthBadGetNewArgsEx.__getnewargs_ex__:__getnewargs_ex__ does not return a tuple containing (tuple, dict):UNDEFINED
+invalid-getnewargs-ex-returned:71:4:71:25:SixthBadGetNewArgsEx.__getnewargs_ex__:__getnewargs_ex__ does not return a tuple containing (tuple, dict):UNDEFINED
diff --git a/tests/functional/i/invalid/invalid_getnewargs/invalid_getnewargs_returned.txt b/tests/functional/i/invalid/invalid_getnewargs/invalid_getnewargs_returned.txt
index 1c719317d8..83c577bfac 100644
--- a/tests/functional/i/invalid/invalid_getnewargs/invalid_getnewargs_returned.txt
+++ b/tests/functional/i/invalid/invalid_getnewargs/invalid_getnewargs_returned.txt
@@ -1,3 +1,3 @@
-invalid-getnewargs-returned:36:4:37:16:FirstBadGetNewArgs.__getnewargs__:__getnewargs__ does not return a tuple:UNDEFINED
-invalid-getnewargs-returned:43:4:44:26:SecondBadGetNewArgs.__getnewargs__:__getnewargs__ does not return a tuple:UNDEFINED
-invalid-getnewargs-returned:50:4:51:34:ThirdBadGetNewArgs.__getnewargs__:__getnewargs__ does not return a tuple:UNDEFINED
+invalid-getnewargs-returned:36:4:36:22:FirstBadGetNewArgs.__getnewargs__:__getnewargs__ does not return a tuple:UNDEFINED
+invalid-getnewargs-returned:43:4:43:22:SecondBadGetNewArgs.__getnewargs__:__getnewargs__ does not return a tuple:UNDEFINED
+invalid-getnewargs-returned:50:4:50:22:ThirdBadGetNewArgs.__getnewargs__:__getnewargs__ does not return a tuple:UNDEFINED
diff --git a/tests/functional/i/invalid/invalid_hash_returned.txt b/tests/functional/i/invalid/invalid_hash_returned.txt
index 3b5f2d6810..0184f5db5c 100644
--- a/tests/functional/i/invalid/invalid_hash_returned.txt
+++ b/tests/functional/i/invalid/invalid_hash_returned.txt
@@ -1,4 +1,4 @@
-invalid-hash-returned:36:4:37:17:FirstBadHash.__hash__:__hash__ does not return int:UNDEFINED
-invalid-hash-returned:43:4:44:21:SecondBadHash.__hash__:__hash__ does not return int:UNDEFINED
-invalid-hash-returned:50:4:51:19:ThirdBadHash.__hash__:__hash__ does not return int:UNDEFINED
-invalid-hash-returned:57:4:58:24:FourthBadHash.__hash__:__hash__ does not return int:UNDEFINED
+invalid-hash-returned:36:4:36:16:FirstBadHash.__hash__:__hash__ does not return int:UNDEFINED
+invalid-hash-returned:43:4:43:16:SecondBadHash.__hash__:__hash__ does not return int:UNDEFINED
+invalid-hash-returned:50:4:50:16:ThirdBadHash.__hash__:__hash__ does not return int:UNDEFINED
+invalid-hash-returned:57:4:57:16:FourthBadHash.__hash__:__hash__ does not return int:UNDEFINED
diff --git a/tests/functional/i/invalid/invalid_index_returned.txt b/tests/functional/i/invalid/invalid_index_returned.txt
index 4479b28cf1..5be63e6591 100644
--- a/tests/functional/i/invalid/invalid_index_returned.txt
+++ b/tests/functional/i/invalid/invalid_index_returned.txt
@@ -1,4 +1,4 @@
-invalid-index-returned:36:4:37:25:FirstBadIndex.__index__:__index__ does not return int:UNDEFINED
-invalid-index-returned:43:4:44:19:SecondBadIndex.__index__:__index__ does not return int:UNDEFINED
-invalid-index-returned:50:4:51:19:ThirdBadIndex.__index__:__index__ does not return int:UNDEFINED
-invalid-index-returned:57:4:58:24:FourthBadIndex.__index__:__index__ does not return int:UNDEFINED
+invalid-index-returned:36:4:36:17:FirstBadIndex.__index__:__index__ does not return int:UNDEFINED
+invalid-index-returned:43:4:43:17:SecondBadIndex.__index__:__index__ does not return int:UNDEFINED
+invalid-index-returned:50:4:50:17:ThirdBadIndex.__index__:__index__ does not return int:UNDEFINED
+invalid-index-returned:57:4:57:17:FourthBadIndex.__index__:__index__ does not return int:UNDEFINED
diff --git a/tests/functional/i/invalid/invalid_length/invalid_length_hint_returned.txt b/tests/functional/i/invalid/invalid_length/invalid_length_hint_returned.txt
index 2447d07438..8856bc95e9 100644
--- a/tests/functional/i/invalid/invalid_length/invalid_length_hint_returned.txt
+++ b/tests/functional/i/invalid/invalid_length/invalid_length_hint_returned.txt
@@ -1,3 +1,3 @@
-invalid-length-hint-returned:38:4:39:17:FirstBadLengthHint.__length_hint__:__length_hint__ does not return non-negative integer:UNDEFINED
-invalid-length-hint-returned:45:4:46:18:SecondBadLengthHint.__length_hint__:__length_hint__ does not return non-negative integer:UNDEFINED
-invalid-length-hint-returned:52:4:53:24:ThirdBadLengthHint.__length_hint__:__length_hint__ does not return non-negative integer:UNDEFINED
+invalid-length-hint-returned:38:4:38:23:FirstBadLengthHint.__length_hint__:__length_hint__ does not return non-negative integer:UNDEFINED
+invalid-length-hint-returned:45:4:45:23:SecondBadLengthHint.__length_hint__:__length_hint__ does not return non-negative integer:UNDEFINED
+invalid-length-hint-returned:52:4:52:23:ThirdBadLengthHint.__length_hint__:__length_hint__ does not return non-negative integer:UNDEFINED
diff --git a/tests/functional/i/invalid/invalid_length/invalid_length_returned.txt b/tests/functional/i/invalid/invalid_length/invalid_length_returned.txt
index 776945e343..f9ed7ac0e3 100644
--- a/tests/functional/i/invalid/invalid_length/invalid_length_returned.txt
+++ b/tests/functional/i/invalid/invalid_length/invalid_length_returned.txt
@@ -1,4 +1,4 @@
-invalid-length-returned:38:4:39:17:FirstBadLen.__len__:__len__ does not return non-negative integer:UNDEFINED
-invalid-length-returned:45:4:46:18:SecondBadLen.__len__:__len__ does not return non-negative integer:UNDEFINED
-invalid-length-returned:52:4:53:24:ThirdBadLen.__len__:__len__ does not return non-negative integer:UNDEFINED
-invalid-length-returned:59:4:60:18:NonRegression.__len__:__len__ does not return non-negative integer:UNDEFINED
+invalid-length-returned:38:4:38:15:FirstBadLen.__len__:__len__ does not return non-negative integer:UNDEFINED
+invalid-length-returned:45:4:45:15:SecondBadLen.__len__:__len__ does not return non-negative integer:UNDEFINED
+invalid-length-returned:52:4:52:15:ThirdBadLen.__len__:__len__ does not return non-negative integer:UNDEFINED
+invalid-length-returned:59:4:59:15:NonRegression.__len__:__len__ does not return non-negative integer:UNDEFINED
diff --git a/tests/functional/i/invalid/invalid_metaclass.txt b/tests/functional/i/invalid/invalid_metaclass.txt
index c5ca48d760..006065705e 100644
--- a/tests/functional/i/invalid/invalid_metaclass.txt
+++ b/tests/functional/i/invalid/invalid_metaclass.txt
@@ -1,6 +1,6 @@
-invalid-metaclass:37:0:38:8:FirstInvalid:Invalid metaclass 'int' used:UNDEFINED
-invalid-metaclass:41:0:42:8:SecondInvalid:Invalid metaclass 'InvalidAsMetaclass' used:UNDEFINED
-invalid-metaclass:45:0:46:8:ThirdInvalid:Invalid metaclass '2' used:UNDEFINED
-invalid-metaclass:49:0:50:8:FourthInvalid:Invalid metaclass 'Instance of invalid_metaclass.InvalidAsMetaclass' used:UNDEFINED
-invalid-metaclass:61:0:62:8:Invalid:Invalid metaclass 'int' used:UNDEFINED
-invalid-metaclass:65:0:66:8:InvalidSecond:Invalid metaclass '1' used:UNDEFINED
+invalid-metaclass:37:0:37:18:FirstInvalid:Invalid metaclass 'int' used:UNDEFINED
+invalid-metaclass:41:0:41:19:SecondInvalid:Invalid metaclass 'InvalidAsMetaclass' used:UNDEFINED
+invalid-metaclass:45:0:45:18:ThirdInvalid:Invalid metaclass '2' used:UNDEFINED
+invalid-metaclass:49:0:49:19:FourthInvalid:Invalid metaclass 'Instance of invalid_metaclass.InvalidAsMetaclass' used:UNDEFINED
+invalid-metaclass:61:0:61:13:Invalid:Invalid metaclass 'int' used:UNDEFINED
+invalid-metaclass:65:0:65:19:InvalidSecond:Invalid metaclass '1' used:UNDEFINED
diff --git a/tests/functional/i/invalid/invalid_metaclass_py3.txt b/tests/functional/i/invalid/invalid_metaclass_py3.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/i/invalid/invalid_name.txt b/tests/functional/i/invalid/invalid_name.txt
index bec705f981..12199a97e4 100644
--- a/tests/functional/i/invalid/invalid_name.txt
+++ b/tests/functional/i/invalid/invalid_name.txt
@@ -1,8 +1,8 @@
 invalid-name:12:0:12:3::"Constant name ""aaa"" doesn't conform to UPPER_CASE naming style":HIGH
 invalid-name:16:4:16:8::"Constant name ""time"" doesn't conform to UPPER_CASE naming style":HIGH
-invalid-name:32:0:33:12:a:"Function name ""a"" doesn't conform to snake_case naming style":HIGH
+invalid-name:32:0:32:5:a:"Function name ""a"" doesn't conform to snake_case naming style":HIGH
 invalid-name:46:4:46:13::"Constant name ""Foocapfor"" doesn't conform to UPPER_CASE naming style":HIGH
-invalid-name:62:0:64:16:a_very_very_very_long_function_name_WithCamelCase_to_make_it_sad:"Function name ""a_very_very_very_long_function_name_WithCamelCase_to_make_it_sad"" doesn't conform to snake_case naming style":HIGH
+invalid-name:62:0:62:68:a_very_very_very_long_function_name_WithCamelCase_to_make_it_sad:"Function name ""a_very_very_very_long_function_name_WithCamelCase_to_make_it_sad"" doesn't conform to snake_case naming style":HIGH
 invalid-name:70:23:70:29:FooBar.__init__:"Argument name ""fooBar"" doesn't conform to snake_case naming style":HIGH
 invalid-name:76:8:76:14:FooBar.func1:"Argument name ""fooBar"" doesn't conform to snake_case naming style":HIGH
 invalid-name:96:8:96:15:FooBar.test_disable_mixed:"Argument name ""fooBar2"" doesn't conform to snake_case naming style":HIGH
diff --git a/tests/functional/i/invalid/invalid_name/invalid_name_module_level.txt b/tests/functional/i/invalid/invalid_name/invalid_name_module_level.txt
index 1d51c6b679..eb095f2606 100644
--- a/tests/functional/i/invalid/invalid_name/invalid_name_module_level.txt
+++ b/tests/functional/i/invalid/invalid_name/invalid_name_module_level.txt
@@ -1 +1 @@
-invalid-name:16:0:17:18:A:"Function name ""A"" doesn't conform to snake_case naming style":HIGH
+invalid-name:16:0:16:5:A:"Function name ""A"" doesn't conform to snake_case naming style":HIGH
diff --git a/tests/functional/i/invalid/invalid_name/invalid_name_multinaming_style.txt b/tests/functional/i/invalid/invalid_name/invalid_name_multinaming_style.txt
index f948f48156..2c7e14ccc7 100644
--- a/tests/functional/i/invalid/invalid_name/invalid_name_multinaming_style.txt
+++ b/tests/functional/i/invalid/invalid_name/invalid_name_multinaming_style.txt
@@ -1 +1 @@
-invalid-name:4:0:5:59:UPPER:"Function name ""UPPER"" doesn't conform to the `down` group in the '^(?:(?P<UP>[A-Z]+)|(?P<down>[a-z]+))$' pattern":HIGH
+invalid-name:4:0:4:9:UPPER:"Function name ""UPPER"" doesn't conform to the `down` group in the '^(?:(?P<UP>[A-Z]+)|(?P<down>[a-z]+))$' pattern":HIGH
diff --git a/tests/functional/i/invalid/invalid_name/invalid_name_property.txt b/tests/functional/i/invalid/invalid_name/invalid_name_property.txt
index dfbc2f4651..84d804ce04 100644
--- a/tests/functional/i/invalid/invalid_name/invalid_name_property.txt
+++ b/tests/functional/i/invalid/invalid_name/invalid_name_property.txt
@@ -1,3 +1,3 @@
 invalid-name:9:16:9:17:custom_prop:"Argument name ""f"" doesn't conform to snake_case naming style":HIGH
-invalid-name:21:4:22:12:FooClass.bar:"Attribute name ""bar"" doesn't conform to '[A-Z]+' pattern":INFERENCE
-invalid-name:37:4:38:12:AnotherFooClass.foo:"Attribute name ""foo"" doesn't conform to '[A-Z]+' pattern":INFERENCE
+invalid-name:21:4:21:11:FooClass.bar:"Attribute name ""bar"" doesn't conform to '[A-Z]+' pattern":INFERENCE
+invalid-name:37:4:37:11:AnotherFooClass.foo:"Attribute name ""foo"" doesn't conform to '[A-Z]+' pattern":INFERENCE
diff --git a/tests/functional/i/invalid/invalid_overridden_method.txt b/tests/functional/i/invalid/invalid_overridden_method.txt
index 65a2d76ab2..5506109df0 100644
--- a/tests/functional/i/invalid/invalid_overridden_method.txt
+++ b/tests/functional/i/invalid/invalid_overridden_method.txt
@@ -1,6 +1,6 @@
-invalid-overridden-method:38:4:39:19:InvalidDerived.prop:Method 'prop' was expected to be 'property', found it instead as 'method':UNDEFINED
-invalid-overridden-method:41:4:42:19:InvalidDerived.async_method:Method 'async_method' was expected to be 'async', found it instead as 'non-async':UNDEFINED
-invalid-overridden-method:45:4:46:19:InvalidDerived.method_a:Method 'method_a' was expected to be 'method', found it instead as 'property':UNDEFINED
-invalid-overridden-method:48:4:49:19:InvalidDerived.method_b:Method 'method_b' was expected to be 'non-async', found it instead as 'async':UNDEFINED
-invalid-overridden-method:122:4:123:20:B.bar:Method 'bar' was expected to be 'property', found it instead as 'method':UNDEFINED
-invalid-overridden-method:126:4:127:20:B.bar2:Method 'bar2' was expected to be 'property', found it instead as 'method':UNDEFINED
+invalid-overridden-method:38:4:38:12:InvalidDerived.prop:Method 'prop' was expected to be 'property', found it instead as 'method':UNDEFINED
+invalid-overridden-method:41:4:41:20:InvalidDerived.async_method:Method 'async_method' was expected to be 'async', found it instead as 'non-async':UNDEFINED
+invalid-overridden-method:45:4:45:16:InvalidDerived.method_a:Method 'method_a' was expected to be 'method', found it instead as 'property':UNDEFINED
+invalid-overridden-method:48:4:48:22:InvalidDerived.method_b:Method 'method_b' was expected to be 'non-async', found it instead as 'async':UNDEFINED
+invalid-overridden-method:122:4:122:11:B.bar:Method 'bar' was expected to be 'property', found it instead as 'method':UNDEFINED
+invalid-overridden-method:126:4:126:12:B.bar2:Method 'bar2' was expected to be 'property', found it instead as 'method':UNDEFINED
diff --git a/tests/functional/i/invalid/invalid_repr_returned.txt b/tests/functional/i/invalid/invalid_repr_returned.txt
index 0f557701ab..53d00abe05 100644
--- a/tests/functional/i/invalid/invalid_repr_returned.txt
+++ b/tests/functional/i/invalid/invalid_repr_returned.txt
@@ -1,3 +1,3 @@
-invalid-repr-returned:36:4:37:21:FirstBadRepr.__repr__:__repr__ does not return str:UNDEFINED
-invalid-repr-returned:43:4:44:16:SecondBadRepr.__repr__:__repr__ does not return str:UNDEFINED
-invalid-repr-returned:50:4:51:34:ThirdBadRepr.__repr__:__repr__ does not return str:UNDEFINED
+invalid-repr-returned:36:4:36:16:FirstBadRepr.__repr__:__repr__ does not return str:UNDEFINED
+invalid-repr-returned:43:4:43:16:SecondBadRepr.__repr__:__repr__ does not return str:UNDEFINED
+invalid-repr-returned:50:4:50:16:ThirdBadRepr.__repr__:__repr__ does not return str:UNDEFINED
diff --git a/tests/functional/i/invalid/invalid_str_returned.txt b/tests/functional/i/invalid/invalid_str_returned.txt
index 522fdb9bff..4e7d96d555 100644
--- a/tests/functional/i/invalid/invalid_str_returned.txt
+++ b/tests/functional/i/invalid/invalid_str_returned.txt
@@ -1,3 +1,3 @@
-invalid-str-returned:36:4:37:21:FirstBadStr.__str__:__str__ does not return str:UNDEFINED
-invalid-str-returned:43:4:44:16:SecondBadStr.__str__:__str__ does not return str:UNDEFINED
-invalid-str-returned:50:4:51:33:ThirdBadStr.__str__:__str__ does not return str:UNDEFINED
+invalid-str-returned:36:4:36:15:FirstBadStr.__str__:__str__ does not return str:UNDEFINED
+invalid-str-returned:43:4:43:15:SecondBadStr.__str__:__str__ does not return str:UNDEFINED
+invalid-str-returned:50:4:50:15:ThirdBadStr.__str__:__str__ does not return str:UNDEFINED
diff --git a/tests/functional/k/keyword_arg_before_vararg.txt b/tests/functional/k/keyword_arg_before_vararg.txt
index f20a319a71..87a88f1a4e 100644
--- a/tests/functional/k/keyword_arg_before_vararg.txt
+++ b/tests/functional/k/keyword_arg_before_vararg.txt
@@ -1,4 +1,4 @@
-keyword-arg-before-vararg:5:0:7:8:check_kwargs_before_args:Keyword argument before variable positional arguments list in the definition of check_kwargs_before_args function:UNDEFINED
-keyword-arg-before-vararg:14:4:16:12:AAAA.func_in_class:Keyword argument before variable positional arguments list in the definition of func_in_class function:UNDEFINED
-keyword-arg-before-vararg:19:4:21:12:AAAA.static_method_in_class:Keyword argument before variable positional arguments list in the definition of static_method_in_class function:UNDEFINED
-keyword-arg-before-vararg:24:4:26:12:AAAA.class_method_in_class:Keyword argument before variable positional arguments list in the definition of class_method_in_class function:UNDEFINED
+keyword-arg-before-vararg:5:0:5:28:check_kwargs_before_args:Keyword argument before variable positional arguments list in the definition of check_kwargs_before_args function:UNDEFINED
+keyword-arg-before-vararg:14:4:14:21:AAAA.func_in_class:Keyword argument before variable positional arguments list in the definition of func_in_class function:UNDEFINED
+keyword-arg-before-vararg:19:4:19:30:AAAA.static_method_in_class:Keyword argument before variable positional arguments list in the definition of static_method_in_class function:UNDEFINED
+keyword-arg-before-vararg:24:4:24:29:AAAA.class_method_in_class:Keyword argument before variable positional arguments list in the definition of class_method_in_class function:UNDEFINED
diff --git a/tests/functional/l/lambda_use_before_assign.txt b/tests/functional/l/lambda_use_before_assign.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/l/line_too_long_end_of_module.txt b/tests/functional/l/line_too_long_end_of_module.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/l/logging_format_interpolation_style.txt b/tests/functional/l/logging_format_interpolation_style.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/l/long_utf8_lines.txt b/tests/functional/l/long_utf8_lines.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/m/member/member_checks_inference_improvements.txt b/tests/functional/m/member/member_checks_inference_improvements.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/m/metaclass_attr_access.txt b/tests/functional/m/metaclass_attr_access.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/m/method_hidden.txt b/tests/functional/m/method_hidden.txt
index c15486dce6..23651bd4a0 100644
--- a/tests/functional/m/method_hidden.txt
+++ b/tests/functional/m/method_hidden.txt
@@ -1,3 +1,3 @@
-method-hidden:18:4:20:19:Cdef.abcd:An attribute defined in functional.m.method_hidden line 12 hides this method:UNDEFINED
-method-hidden:86:4:87:12:One.one:An attribute defined in functional.m.method_hidden line 84 hides this method:UNDEFINED
-method-hidden:113:4:114:12:Child._protected:An attribute defined in functional.m.method_hidden line 109 hides this method:UNDEFINED
+method-hidden:18:4:18:12:Cdef.abcd:An attribute defined in functional.m.method_hidden line 12 hides this method:UNDEFINED
+method-hidden:86:4:86:11:One.one:An attribute defined in functional.m.method_hidden line 84 hides this method:UNDEFINED
+method-hidden:113:4:113:18:Child._protected:An attribute defined in functional.m.method_hidden line 109 hides this method:UNDEFINED
diff --git a/tests/functional/m/missing/missing_class_docstring.txt b/tests/functional/m/missing/missing_class_docstring.txt
index 2acd9bc197..4aaa0a8216 100644
--- a/tests/functional/m/missing/missing_class_docstring.txt
+++ b/tests/functional/m/missing/missing_class_docstring.txt
@@ -1 +1 @@
-missing-class-docstring:5:0:6:8:Klass:Missing class docstring:HIGH
+missing-class-docstring:5:0:5:11:Klass:Missing class docstring:HIGH
diff --git a/tests/functional/m/missing/missing_docstring.txt b/tests/functional/m/missing/missing_docstring.txt
index af030e11c4..4ed84ed06c 100644
--- a/tests/functional/m/missing/missing_docstring.txt
+++ b/tests/functional/m/missing/missing_docstring.txt
@@ -1,3 +1,3 @@
 missing-module-docstring:1:0:None:None::Missing module docstring:HIGH
-missing-class-docstring:21:0:22:8:ClassUndocumented:Missing class docstring:HIGH
-missing-function-docstring:25:0:26:8:public_undocumented:Missing function or method docstring:HIGH
+missing-class-docstring:21:0:21:23:ClassUndocumented:Missing class docstring:HIGH
+missing-function-docstring:25:0:25:23:public_undocumented:Missing function or method docstring:HIGH
diff --git a/tests/functional/m/missing/missing_docstring_new_style.txt b/tests/functional/m/missing/missing_docstring_new_style.txt
index f0a456c24a..645791a65f 100644
--- a/tests/functional/m/missing/missing_docstring_new_style.txt
+++ b/tests/functional/m/missing/missing_docstring_new_style.txt
@@ -1,5 +1,5 @@
 missing-module-docstring:1:0:None:None::Missing module docstring:HIGH
-missing-class-docstring:9:0:10:8:UndocumentedClass:Missing class docstring:HIGH
-missing-class-docstring:19:0:20:8:OtherClassUndocumented:Missing class docstring:HIGH
-missing-function-docstring:36:0:37:8:public_undocumented:Missing function or method docstring:HIGH
-missing-function-docstring:46:0:47:8:undocumented_other_function:Missing function or method docstring:HIGH
+missing-class-docstring:9:0:9:23:UndocumentedClass:Missing class docstring:HIGH
+missing-class-docstring:19:0:19:28:OtherClassUndocumented:Missing class docstring:HIGH
+missing-function-docstring:36:0:36:23:public_undocumented:Missing function or method docstring:HIGH
+missing-function-docstring:46:0:46:31:undocumented_other_function:Missing function or method docstring:HIGH
diff --git a/tests/functional/m/missing/missing_function_docstring.txt b/tests/functional/m/missing/missing_function_docstring.txt
index 9eea693c09..2f75b8e123 100644
--- a/tests/functional/m/missing/missing_function_docstring.txt
+++ b/tests/functional/m/missing/missing_function_docstring.txt
@@ -1,2 +1,2 @@
-missing-function-docstring:5:0:6:8:func:Missing function or method docstring:HIGH
-missing-function-docstring:18:4:19:12:MyClass.__init__:Missing function or method docstring:INFERENCE
+missing-function-docstring:5:0:5:8:func:Missing function or method docstring:HIGH
+missing-function-docstring:18:4:18:16:MyClass.__init__:Missing function or method docstring:INFERENCE
diff --git a/tests/functional/m/missing/missing_function_docstring_min_length.txt b/tests/functional/m/missing/missing_function_docstring_min_length.txt
index cf38aceee1..477c8ee8cc 100644
--- a/tests/functional/m/missing/missing_function_docstring_min_length.txt
+++ b/tests/functional/m/missing/missing_function_docstring_min_length.txt
@@ -1,2 +1,2 @@
-missing-function-docstring:9:0:11:8:func_two:Missing function or method docstring:HIGH
-missing-function-docstring:14:0:18:12:func_three:Missing function or method docstring:HIGH
+missing-function-docstring:9:0:9:12:func_two:Missing function or method docstring:HIGH
+missing-function-docstring:14:0:14:14:func_three:Missing function or method docstring:HIGH
diff --git a/tests/functional/m/missing/missing_function_docstring_rgx.txt b/tests/functional/m/missing/missing_function_docstring_rgx.txt
index ee085ec067..b3d5227a7e 100644
--- a/tests/functional/m/missing/missing_function_docstring_rgx.txt
+++ b/tests/functional/m/missing/missing_function_docstring_rgx.txt
@@ -1 +1 @@
-missing-function-docstring:10:4:11:19:Child.__eq__:Missing function or method docstring:INFERENCE
+missing-function-docstring:10:4:10:14:Child.__eq__:Missing function or method docstring:INFERENCE
diff --git a/tests/functional/m/missing/missing_module_docstring_disabled.txt b/tests/functional/m/missing/missing_module_docstring_disabled.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/m/missing/missing_module_docstring_empty.txt b/tests/functional/m/missing/missing_module_docstring_empty.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/m/missing/missing_self_argument.txt b/tests/functional/m/missing/missing_self_argument.txt
index 855f83f584..14a9a98633 100644
--- a/tests/functional/m/missing/missing_self_argument.txt
+++ b/tests/functional/m/missing/missing_self_argument.txt
@@ -1,3 +1,3 @@
-no-method-argument:12:4:13:47:MyClass.method:Method has no argument:UNDEFINED
-no-method-argument:15:4:17:20:MyClass.setup:Method has no argument:UNDEFINED
+no-method-argument:12:4:12:14:MyClass.method:Method has no argument:UNDEFINED
+no-method-argument:15:4:15:13:MyClass.setup:Method has no argument:UNDEFINED
 undefined-variable:17:8:17:12:MyClass.setup:Undefined variable 'self':UNDEFINED
diff --git a/tests/functional/m/monkeypatch_method.txt b/tests/functional/m/monkeypatch_method.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/n/name/name_good_bad_names_regex.txt b/tests/functional/n/name/name_good_bad_names_regex.txt
index 78d57990d6..66c1c99f15 100644
--- a/tests/functional/n/name/name_good_bad_names_regex.txt
+++ b/tests/functional/n/name/name_good_bad_names_regex.txt
@@ -1,3 +1,3 @@
 disallowed-name:5:0:5:26::"Disallowed name ""explicit_bad_some_constant""":UNDEFINED
 invalid-name:7:0:7:28::"Constant name ""snake_case_bad_SOME_CONSTANT"" doesn't conform to snake_case naming style ('([^\\W\\dA-Z][^\\WA-Z]*|__.*__)$' pattern)":HIGH
-disallowed-name:19:0:20:8:disallowed_2_snake_case:"Disallowed name ""disallowed_2_snake_case""":UNDEFINED
+disallowed-name:19:0:19:27:disallowed_2_snake_case:"Disallowed name ""disallowed_2_snake_case""":UNDEFINED
diff --git a/tests/functional/n/name/name_preset_snake_case.txt b/tests/functional/n/name/name_preset_snake_case.txt
index 664b2db90e..339f27bd8a 100644
--- a/tests/functional/n/name/name_preset_snake_case.txt
+++ b/tests/functional/n/name/name_preset_snake_case.txt
@@ -1,5 +1,5 @@
 invalid-name:6:0:6:13::"Constant name ""SOME_CONSTANT"" doesn't conform to snake_case naming style ('([^\\W\\dA-Z][^\\WA-Z]*|__.*__)$' pattern)":HIGH
-invalid-name:13:0:22:83:MyClass:"Class name ""MyClass"" doesn't conform to snake_case naming style ('[^\\W\\dA-Z][^\\WA-Z]+$' pattern)":HIGH
-invalid-name:25:0:26:8:sayHello:"Function name ""sayHello"" doesn't conform to snake_case naming style ('([^\\W\\dA-Z][^\\WA-Z]{2,}|_[^\\WA-Z]*|__[^\\WA-Z\\d_][^\\WA-Z]+__)$' pattern)":HIGH
-invalid-name:29:0:31:22:FooEnum:"Class name ""FooEnum"" doesn't conform to snake_case naming style ('[^\\W\\dA-Z][^\\WA-Z]+$' pattern)":HIGH
-invalid-name:34:0:35:45:Bar:"Class name ""Bar"" doesn't conform to snake_case naming style ('[^\\W\\dA-Z][^\\WA-Z]+$' pattern)":HIGH
+invalid-name:13:0:13:13:MyClass:"Class name ""MyClass"" doesn't conform to snake_case naming style ('[^\\W\\dA-Z][^\\WA-Z]+$' pattern)":HIGH
+invalid-name:25:0:25:12:sayHello:"Function name ""sayHello"" doesn't conform to snake_case naming style ('([^\\W\\dA-Z][^\\WA-Z]{2,}|_[^\\WA-Z]*|__[^\\WA-Z\\d_][^\\WA-Z]+__)$' pattern)":HIGH
+invalid-name:29:0:29:13:FooEnum:"Class name ""FooEnum"" doesn't conform to snake_case naming style ('[^\\W\\dA-Z][^\\WA-Z]+$' pattern)":HIGH
+invalid-name:34:0:34:9:Bar:"Class name ""Bar"" doesn't conform to snake_case naming style ('[^\\W\\dA-Z][^\\WA-Z]+$' pattern)":HIGH
diff --git a/tests/functional/n/name/name_styles.txt b/tests/functional/n/name/name_styles.txt
index a6d18a1667..ad7dad05fb 100644
--- a/tests/functional/n/name/name_styles.txt
+++ b/tests/functional/n/name/name_styles.txt
@@ -1,17 +1,17 @@
 invalid-name:11:0:11:14::"Constant name ""bad_const_name"" doesn't conform to UPPER_CASE naming style":HIGH
-invalid-name:14:0:17:24:BADFUNCTION_name:"Function name ""BADFUNCTION_name"" doesn't conform to snake_case naming style":HIGH
+invalid-name:14:0:14:20:BADFUNCTION_name:"Function name ""BADFUNCTION_name"" doesn't conform to snake_case naming style":HIGH
 invalid-name:16:4:16:17:BADFUNCTION_name:"Variable name ""BAD_LOCAL_VAR"" doesn't conform to snake_case naming style":HIGH
 invalid-name:20:21:20:29:func_bad_argname:"Argument name ""NOT_GOOD"" doesn't conform to snake_case naming style":HIGH
-invalid-name:30:0:31:32:bad_class_name:"Class name ""bad_class_name"" doesn't conform to PascalCase naming style":HIGH
+invalid-name:30:0:30:20:bad_class_name:"Class name ""bad_class_name"" doesn't conform to PascalCase naming style":HIGH
 invalid-name:41:8:41:27:CorrectClassName.__init__:"Attribute name ""_Bad_AtTR_name"" doesn't conform to snake_case naming style":HIGH
 invalid-name:42:8:42:28:CorrectClassName.__init__:"Attribute name ""Bad_PUBLIC_name"" doesn't conform to snake_case naming style":HIGH
-invalid-name:47:4:48:39:CorrectClassName.BadMethodName:"Method name ""BadMethodName"" doesn't conform to snake_case naming style":INFERENCE
-invalid-name:53:4:54:41:CorrectClassName.__DunDER_IS_not_free_for_all__:"Method name ""__DunDER_IS_not_free_for_all__"" doesn't conform to snake_case naming style":INFERENCE
+invalid-name:47:4:47:21:CorrectClassName.BadMethodName:"Method name ""BadMethodName"" doesn't conform to snake_case naming style":INFERENCE
+invalid-name:53:4:53:38:CorrectClassName.__DunDER_IS_not_free_for_all__:"Method name ""__DunDER_IS_not_free_for_all__"" doesn't conform to snake_case naming style":INFERENCE
 invalid-name:83:0:83:18::"Class name ""BAD_NAME_FOR_CLASS"" doesn't conform to PascalCase naming style":HIGH
 invalid-name:84:0:84:23::"Class name ""NEXT_BAD_NAME_FOR_CLASS"" doesn't conform to PascalCase naming style":HIGH
 invalid-name:91:0:91:11::"Class name ""NOT_CORRECT"" doesn't conform to PascalCase naming style":HIGH
 invalid-name:97:4:97:22:test_globals:"Constant name ""AlsoCorrect"" doesn't conform to UPPER_CASE naming style":HIGH
-invalid-name:110:4:112:12:FooClass.PROPERTY_NAME:"Attribute name ""PROPERTY_NAME"" doesn't conform to snake_case naming style":INFERENCE
-invalid-name:116:4:118:12:FooClass.ABSTRACT_PROPERTY_NAME:"Attribute name ""ABSTRACT_PROPERTY_NAME"" doesn't conform to snake_case naming style":INFERENCE
-invalid-name:121:4:123:12:FooClass.PROPERTY_NAME_SETTER:"Attribute name ""PROPERTY_NAME_SETTER"" doesn't conform to snake_case naming style":INFERENCE
+invalid-name:110:4:110:21:FooClass.PROPERTY_NAME:"Attribute name ""PROPERTY_NAME"" doesn't conform to snake_case naming style":INFERENCE
+invalid-name:116:4:116:30:FooClass.ABSTRACT_PROPERTY_NAME:"Attribute name ""ABSTRACT_PROPERTY_NAME"" doesn't conform to snake_case naming style":INFERENCE
+invalid-name:121:4:121:28:FooClass.PROPERTY_NAME_SETTER:"Attribute name ""PROPERTY_NAME_SETTER"" doesn't conform to snake_case naming style":INFERENCE
 invalid-name:152:4:152:17:FooEnum:"Class constant name ""bad_enum_name"" doesn't conform to UPPER_CASE naming style":HIGH
diff --git a/tests/functional/n/namePresetCamelCase.txt b/tests/functional/n/namePresetCamelCase.txt
index 7b9ec86231..9461c6a536 100644
--- a/tests/functional/n/namePresetCamelCase.txt
+++ b/tests/functional/n/namePresetCamelCase.txt
@@ -1,3 +1,3 @@
 invalid-name:3:0:3:13::"Constant name ""SOME_CONSTANT"" doesn't conform to camelCase naming style ('([^\\W\\dA-Z][^\\W_]*|__.*__)$' pattern)":HIGH
-invalid-name:10:0:19:79:MyClass:"Class name ""MyClass"" doesn't conform to camelCase naming style ('[^\\W\\dA-Z][^\\W_]+$' pattern)":HIGH
-invalid-name:22:0:23:8:say_hello:"Function name ""say_hello"" doesn't conform to camelCase naming style ('([^\\W\\dA-Z][^\\W_]{2,}|__[^\\W\\dA-Z_]\\w+__)$' pattern)":HIGH
+invalid-name:10:0:10:13:MyClass:"Class name ""MyClass"" doesn't conform to camelCase naming style ('[^\\W\\dA-Z][^\\W_]+$' pattern)":HIGH
+invalid-name:22:0:22:13:say_hello:"Function name ""say_hello"" doesn't conform to camelCase naming style ('([^\\W\\dA-Z][^\\W_]{2,}|__[^\\W\\dA-Z_]\\w+__)$' pattern)":HIGH
diff --git a/tests/functional/n/no/no_member.txt b/tests/functional/n/no/no_member.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/n/no/no_member_nested_namedtuple.txt b/tests/functional/n/no/no_member_nested_namedtuple.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/n/no/no_member_subclassed_dataclasses.txt b/tests/functional/n/no/no_member_subclassed_dataclasses.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/n/no/no_method_argument_py38.txt b/tests/functional/n/no/no_method_argument_py38.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/n/no/no_self_argument.txt b/tests/functional/n/no/no_self_argument.txt
index 74f6ac7b1a..45d12cc321 100644
--- a/tests/functional/n/no/no_self_argument.txt
+++ b/tests/functional/n/no/no_self_argument.txt
@@ -1,2 +1,2 @@
-no-self-argument:8:4:10:16:NoSelfArgument.__init__:"Method should have ""self"" as first argument":UNDEFINED
-no-self-argument:12:4:14:18:NoSelfArgument.abdc:"Method should have ""self"" as first argument":UNDEFINED
+no-self-argument:8:4:8:16:NoSelfArgument.__init__:"Method should have ""self"" as first argument":UNDEFINED
+no-self-argument:12:4:12:12:NoSelfArgument.abdc:"Method should have ""self"" as first argument":UNDEFINED
diff --git a/tests/functional/n/no/no_self_argument_py37.txt b/tests/functional/n/no/no_self_argument_py37.txt
index 05cd3143d4..9f5779ab69 100644
--- a/tests/functional/n/no/no_self_argument_py37.txt
+++ b/tests/functional/n/no/no_self_argument_py37.txt
@@ -1 +1 @@
-no-self-argument:13:4:15:12:Toto.__class_other__:"Method should have ""self"" as first argument":UNDEFINED
+no-self-argument:13:4:13:23:Toto.__class_other__:"Method should have ""self"" as first argument":UNDEFINED
diff --git a/tests/functional/n/no/no_self_use.txt b/tests/functional/n/no/no_self_use.txt
index a349f0bc76..4cc4774ff2 100644
--- a/tests/functional/n/no/no_self_use.txt
+++ b/tests/functional/n/no/no_self_use.txt
@@ -1,2 +1,2 @@
-no-self-use:16:4:18:22:Toto.function_method:Method could be a function:UNDEFINED
-no-self-use:24:4:26:22:Toto.async_function_method:Method could be a function:UNDEFINED
+no-self-use:16:4:16:23:Toto.function_method:Method could be a function:UNDEFINED
+no-self-use:24:4:24:35:Toto.async_function_method:Method could be a function:UNDEFINED
diff --git a/tests/functional/n/no/no_self_use_py3.txt b/tests/functional/n/no/no_self_use_py3.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/n/no/no_warning_docstring.txt b/tests/functional/n/no/no_warning_docstring.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/n/non/non_ascii_name.txt b/tests/functional/n/non/non_ascii_name.txt
index 2cda6962ef..41f1730612 100644
--- a/tests/functional/n/non/non_ascii_name.txt
+++ b/tests/functional/n/non/non_ascii_name.txt
@@ -1,2 +1,2 @@
 non-ascii-name:3:0:3:10::"Variable name ""áéíóú"" contains a non-ASCII character, consider renaming it.":HIGH
-non-ascii-name:5:0:6:12:úóíéá:"Function name ""úóíéá"" contains a non-ASCII character, consider renaming it.":HIGH
+non-ascii-name:5:0:5:9:úóíéá:"Function name ""úóíéá"" contains a non-ASCII character, consider renaming it.":HIGH
diff --git a/tests/functional/n/non/non_ascii_name_backward_test_code.txt b/tests/functional/n/non/non_ascii_name_backward_test_code.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/n/non/non_ascii_name_backward_test_msg.txt b/tests/functional/n/non/non_ascii_name_backward_test_msg.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/n/non/non_init_parent_called.txt b/tests/functional/n/non/non_init_parent_called.txt
index 97f6eb4edc..06de9a2443 100644
--- a/tests/functional/n/non/non_init_parent_called.txt
+++ b/tests/functional/n/non/non_init_parent_called.txt
@@ -2,5 +2,5 @@ import-error:7:0:7:18::Unable to import 'nonexistant':UNDEFINED
 non-parent-init-called:15:8:15:26:AAAA.__init__:__init__ method from a non direct base class 'BBBBMixin' is called:UNDEFINED
 no-member:23:50:23:77:CCC:Module 'functional.n.non.non_init_parent_called' has no 'BBBB' member:INFERENCE
 no-member:28:8:28:35:CCC.__init__:Module 'functional.n.non.non_init_parent_called' has no 'BBBB' member:INFERENCE
-super-init-not-called:49:4:51:25:Super2.__init__:__init__ method from base class 'dict' is not called:INFERENCE
+super-init-not-called:49:4:49:16:Super2.__init__:__init__ method from base class 'dict' is not called:INFERENCE
 no-member:51:8:51:23:Super2.__init__:Super of 'Super2' has no '__woohoo__' member:INFERENCE
diff --git a/tests/functional/n/non/non_iterator_returned.txt b/tests/functional/n/non/non_iterator_returned.txt
index a5d3337dfe..a0d3d665f6 100644
--- a/tests/functional/n/non/non_iterator_returned.txt
+++ b/tests/functional/n/non/non_iterator_returned.txt
@@ -1,4 +1,4 @@
-non-iterator-returned:79:4:80:17:FirstBadIterator.__iter__:__iter__ returns non-iterator:UNDEFINED
-non-iterator-returned:86:4:87:19:SecondBadIterator.__iter__:__iter__ returns non-iterator:UNDEFINED
-non-iterator-returned:93:4:94:34:ThirdBadIterator.__iter__:__iter__ returns non-iterator:UNDEFINED
-non-iterator-returned:100:4:101:31:FourthBadIterator.__iter__:__iter__ returns non-iterator:UNDEFINED
+non-iterator-returned:79:4:79:16:FirstBadIterator.__iter__:__iter__ returns non-iterator:UNDEFINED
+non-iterator-returned:86:4:86:16:SecondBadIterator.__iter__:__iter__ returns non-iterator:UNDEFINED
+non-iterator-returned:93:4:93:16:ThirdBadIterator.__iter__:__iter__ returns non-iterator:UNDEFINED
+non-iterator-returned:100:4:100:16:FourthBadIterator.__iter__:__iter__ returns non-iterator:UNDEFINED
diff --git a/tests/functional/n/non/non_parent_init_called.txt b/tests/functional/n/non/non_parent_init_called.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/n/non_ascii_import/non_ascii_import.txt b/tests/functional/n/non_ascii_import/non_ascii_import.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/n/non_ascii_import/non_ascii_import_as_okay.txt b/tests/functional/n/non_ascii_import/non_ascii_import_as_okay.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/n/non_ascii_name/non_ascii_name_dict_kwargs.txt b/tests/functional/n/non_ascii_name/non_ascii_name_dict_kwargs.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/n/non_ascii_name/non_ascii_name_function.txt b/tests/functional/n/non_ascii_name/non_ascii_name_function.txt
index 949059da9e..c985a91ac2 100644
--- a/tests/functional/n/non_ascii_name/non_ascii_name_function.txt
+++ b/tests/functional/n/non_ascii_name/non_ascii_name_function.txt
@@ -1 +1 @@
-non-ascii-name:13:0:15:28:sayНello:"Function name ""sayНello"" contains a non-ASCII character, consider renaming it.":HIGH
+non-ascii-name:13:0:13:12:sayНello:"Function name ""sayНello"" contains a non-ASCII character, consider renaming it.":HIGH
diff --git a/tests/functional/n/non_ascii_name/non_ascii_name_staticmethod.txt b/tests/functional/n/non_ascii_name/non_ascii_name_staticmethod.txt
index 8bc3e8ce69..5aa2dc7e96 100644
--- a/tests/functional/n/non_ascii_name/non_ascii_name_staticmethod.txt
+++ b/tests/functional/n/non_ascii_name/non_ascii_name_staticmethod.txt
@@ -1 +1 @@
-non-ascii-name:11:4:13:19:OkayClass.umlaut_ä:"Function name ""umlaut_ä"" contains a non-ASCII character, consider renaming it.":HIGH
+non-ascii-name:11:4:11:16:OkayClass.umlaut_ä:"Function name ""umlaut_ä"" contains a non-ASCII character, consider renaming it.":HIGH
diff --git a/tests/functional/n/non_ascii_name_class/non_ascii_name_class.txt b/tests/functional/n/non_ascii_name_class/non_ascii_name_class.txt
index 92c4430b31..eda2ba0986 100644
--- a/tests/functional/n/non_ascii_name_class/non_ascii_name_class.txt
+++ b/tests/functional/n/non_ascii_name_class/non_ascii_name_class.txt
@@ -1 +1 @@
-non-ascii-name:11:0:16:19:НoldIt:"Class name ""НoldIt"" contains a non-ASCII character, consider renaming it.":HIGH
+non-ascii-name:11:0:11:12:НoldIt:"Class name ""НoldIt"" contains a non-ASCII character, consider renaming it.":HIGH
diff --git a/tests/functional/n/non_ascii_name_class/non_ascii_name_class_method.txt b/tests/functional/n/non_ascii_name_class/non_ascii_name_class_method.txt
index 8d7606e679..43249c212f 100644
--- a/tests/functional/n/non_ascii_name_class/non_ascii_name_class_method.txt
+++ b/tests/functional/n/non_ascii_name_class/non_ascii_name_class_method.txt
@@ -1 +1 @@
-non-ascii-name:12:4:14:19:OkayClass.umlaut_ä:"Function name ""umlaut_ä"" contains a non-ASCII character, consider renaming it.":HIGH
+non-ascii-name:12:4:12:16:OkayClass.umlaut_ä:"Function name ""umlaut_ä"" contains a non-ASCII character, consider renaming it.":HIGH
diff --git a/tests/functional/n/nonlocal_and_global.txt b/tests/functional/n/nonlocal_and_global.txt
index 2bc929cdb6..8cf0948f71 100644
--- a/tests/functional/n/nonlocal_and_global.txt
+++ b/tests/functional/n/nonlocal_and_global.txt
@@ -1 +1 @@
-nonlocal-and-global:4:0:6:18:bad:Name 'missing' is nonlocal and global:UNDEFINED
+nonlocal-and-global:4:0:4:7:bad:Name 'missing' is nonlocal and global:UNDEFINED
diff --git a/tests/functional/n/not_async_context_manager_py37.txt b/tests/functional/n/not_async_context_manager_py37.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/o/object_as_class_attribute.txt b/tests/functional/o/object_as_class_attribute.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/o/old_division_floats.txt b/tests/functional/o/old_division_floats.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/o/old_division_manually.txt b/tests/functional/o/old_division_manually.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/o/overloaded_operator.txt b/tests/functional/o/overloaded_operator.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/o/overridden_final_method_py38.txt b/tests/functional/o/overridden_final_method_py38.txt
index 8f7af49e2a..d5c4374db9 100644
--- a/tests/functional/o/overridden_final_method_py38.txt
+++ b/tests/functional/o/overridden_final_method_py38.txt
@@ -1,2 +1,2 @@
-overridden-final-method:15:4:16:12:Subclass.my_method:Method 'my_method' overrides a method decorated with typing.final which is defined in class 'Base':UNDEFINED
-overridden-final-method:30:4:31:12:Subclass2.my_method:Method 'my_method' overrides a method decorated with typing.final which is defined in class 'BaseConditional':UNDEFINED
+overridden-final-method:15:4:15:17:Subclass.my_method:Method 'my_method' overrides a method decorated with typing.final which is defined in class 'Base':UNDEFINED
+overridden-final-method:30:4:30:17:Subclass2.my_method:Method 'my_method' overrides a method decorated with typing.final which is defined in class 'BaseConditional':UNDEFINED
diff --git a/tests/functional/p/pattern_matching.txt b/tests/functional/p/pattern_matching.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/p/postponed_evaluation_activated.txt b/tests/functional/p/postponed_evaluation_activated.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/p/postponed_evaluation_activated_with_alias.txt b/tests/functional/p/postponed_evaluation_activated_with_alias.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/p/pragma_after_backslash.txt b/tests/functional/p/pragma_after_backslash.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/p/property_affectation_py26.txt b/tests/functional/p/property_affectation_py26.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/p/property_with_parameters.txt b/tests/functional/p/property_with_parameters.txt
index 326f195436..bc07bc6d19 100644
--- a/tests/functional/p/property_with_parameters.txt
+++ b/tests/functional/p/property_with_parameters.txt
@@ -1 +1 @@
-property-with-parameters:7:4:8:29:Cls.attribute:Cannot have defined parameters for properties:UNDEFINED
+property-with-parameters:7:4:7:17:Cls.attribute:Cannot have defined parameters for properties:UNDEFINED
diff --git a/tests/functional/p/protocol_classes.txt b/tests/functional/p/protocol_classes.txt
index f08492c277..c9d3861467 100644
--- a/tests/functional/p/protocol_classes.txt
+++ b/tests/functional/p/protocol_classes.txt
@@ -1,3 +1,3 @@
-no-self-use:31:4:32:11:HasherFake.update:Method could be a function:UNDEFINED
+no-self-use:31:4:31:14:HasherFake.update:Method could be a function:UNDEFINED
 unused-argument:31:21:31:32:HasherFake.update:Unused argument 'blob':INFERENCE
-no-self-use:33:4:34:11:HasherFake.digest:Method could be a function:UNDEFINED
+no-self-use:33:4:33:14:HasherFake.digest:Method could be a function:UNDEFINED
diff --git a/tests/functional/p/py_version_35.txt b/tests/functional/p/py_version_35.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/raising/raising_self.txt b/tests/functional/r/raising/raising_self.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/recursion/recursion_error_2667.txt b/tests/functional/r/recursion/recursion_error_2667.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/recursion/recursion_error_2836.txt b/tests/functional/r/recursion/recursion_error_2836.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/recursion/recursion_error_2861.txt b/tests/functional/r/recursion/recursion_error_2861.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/recursion/recursion_error_2899.txt b/tests/functional/r/recursion/recursion_error_2899.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/recursion/recursion_error_2906.txt b/tests/functional/r/recursion/recursion_error_2906.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/recursion/recursion_error_3152.txt b/tests/functional/r/recursion/recursion_error_3152.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/recursion/recursion_error_3159.txt b/tests/functional/r/recursion/recursion_error_3159.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/recursion/recursion_error_940.txt b/tests/functional/r/recursion/recursion_error_940.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/recursion/recursion_error_crash.txt b/tests/functional/r/recursion/recursion_error_crash.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/recursion/recursion_error_crash_2683.txt b/tests/functional/r/recursion/recursion_error_crash_2683.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/recursion/recursion_error_crash_astroid_623.txt b/tests/functional/r/recursion/recursion_error_crash_astroid_623.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/recursion/recursion_regression_2960.txt b/tests/functional/r/recursion/recursion_regression_2960.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/redefined/redefined_outer_name_type_checking.txt b/tests/functional/r/redefined/redefined_outer_name_type_checking.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/regression/regression_1326_crash_uninferable.txt b/tests/functional/r/regression/regression_1326_crash_uninferable.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/regression/regression_2306_enum_value.txt b/tests/functional/r/regression/regression_2306_enum_value.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/regression/regression_2443_duplicate_bases.txt b/tests/functional/r/regression/regression_2443_duplicate_bases.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/regression/regression_2913.txt b/tests/functional/r/regression/regression_2913.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/regression/regression_2937_ifexp.txt b/tests/functional/r/regression/regression_2937_ifexp.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/regression/regression_3091.txt b/tests/functional/r/regression/regression_3091.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/regression/regression_3231_no_member_property.txt b/tests/functional/r/regression/regression_3231_no_member_property.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/regression/regression_3507_typing_alias_isinstance.txt b/tests/functional/r/regression/regression_3507_typing_alias_isinstance.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/regression/regression_3535_double_enum_inherit.txt b/tests/functional/r/regression/regression_3535_double_enum_inherit.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/regression/regression_3595_notcallable_collections.txt b/tests/functional/r/regression/regression_3595_notcallable_collections.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/regression/regression_4221_object_instanceattr.txt b/tests/functional/r/regression/regression_4221_object_instanceattr.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/regression/regression_4358_unsubscriptable_enum.txt b/tests/functional/r/regression/regression_4358_unsubscriptable_enum.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/regression/regression_4612_crash_pytest_fixture.txt b/tests/functional/r/regression/regression_4612_crash_pytest_fixture.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/regression/regression_4680.txt b/tests/functional/r/regression/regression_4680.txt
index 19732c5d1e..072e54f394 100644
--- a/tests/functional/r/regression/regression_4680.txt
+++ b/tests/functional/r/regression/regression_4680.txt
@@ -1,2 +1,2 @@
 import-error:3:0:3:14::Unable to import 'pkg.sub':UNDEFINED
-undefined-variable:10:0:11:8:FailedTwo:Undefined variable 'ab':UNDEFINED
+undefined-variable:10:0:10:15:FailedTwo:Undefined variable 'ab':UNDEFINED
diff --git a/tests/functional/r/regression/regression_4723.txt b/tests/functional/r/regression/regression_4723.txt
index a187311baa..74d3df5a22 100644
--- a/tests/functional/r/regression/regression_4723.txt
+++ b/tests/functional/r/regression/regression_4723.txt
@@ -1 +1 @@
-no-method-argument:15:4:16:12:B.play:Method has no argument:UNDEFINED
+no-method-argument:15:4:15:12:B.play:Method has no argument:UNDEFINED
diff --git a/tests/functional/r/regression/regression_4891.txt b/tests/functional/r/regression/regression_4891.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/regression/regression_issue_4631.txt b/tests/functional/r/regression/regression_issue_4631.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/regression/regression_issue_4633.txt b/tests/functional/r/regression/regression_issue_4633.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/regression/regression_no_member_1078.txt b/tests/functional/r/regression/regression_no_member_1078.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/regression/regression_no_value_for_parameter.txt b/tests/functional/r/regression/regression_no_value_for_parameter.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/regression/regression_posonly_args.txt b/tests/functional/r/regression/regression_posonly_args.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/regression/regression_property_no_member_2641.txt b/tests/functional/r/regression/regression_property_no_member_2641.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/regression/regression_property_no_member_3269.txt b/tests/functional/r/regression/regression_property_no_member_3269.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/regression/regression_property_no_member_844.txt b/tests/functional/r/regression/regression_property_no_member_844.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/regression/regression_property_no_member_870.txt b/tests/functional/r/regression/regression_property_no_member_870.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/regression/regression_property_slots_2439.txt b/tests/functional/r/regression/regression_property_slots_2439.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/regression_02/regression_4982.txt b/tests/functional/r/regression_02/regression_4982.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/regression_02/regression_5030.txt b/tests/functional/r/regression_02/regression_5030.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/regression_02/regression_5048.txt b/tests/functional/r/regression_02/regression_5048.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/regression_02/regression_5244.txt b/tests/functional/r/regression_02/regression_5244.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/regression_02/regression_5461.txt b/tests/functional/r/regression_02/regression_5461.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/regression_02/regression_node_statement.txt b/tests/functional/r/regression_02/regression_node_statement.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/regression_02/regression_node_statement_two.txt b/tests/functional/r/regression_02/regression_node_statement_two.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/regression_02/regression_too_many_arguments_2335.txt b/tests/functional/r/regression_02/regression_too_many_arguments_2335.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/r/return_in_init.txt b/tests/functional/r/return_in_init.txt
index 3accd68341..7586c50391 100644
--- a/tests/functional/r/return_in_init.txt
+++ b/tests/functional/r/return_in_init.txt
@@ -1 +1 @@
-return-in-init:5:4:6:16:MyClass.__init__:Explicit return in __init__:UNDEFINED
+return-in-init:5:4:5:16:MyClass.__init__:Explicit return in __init__:UNDEFINED
diff --git a/tests/functional/s/signature_differs.txt b/tests/functional/s/signature_differs.txt
index 4311f4ef18..8c355bc6c3 100644
--- a/tests/functional/s/signature_differs.txt
+++ b/tests/functional/s/signature_differs.txt
@@ -1 +1 @@
-signature-differs:21:4:22:24:Cdef.abcd:Signature differs from overridden 'abcd' method:UNDEFINED
+signature-differs:21:4:21:12:Cdef.abcd:Signature differs from overridden 'abcd' method:UNDEFINED
diff --git a/tests/functional/s/singledispatch_functions.txt b/tests/functional/s/singledispatch_functions.txt
index 1879d136da..88973375f5 100644
--- a/tests/functional/s/singledispatch_functions.txt
+++ b/tests/functional/s/singledispatch_functions.txt
@@ -1,5 +1,5 @@
 unused-variable:60:4:60:10:_:Unused variable 'unused':UNDEFINED
 unused-argument:65:24:65:27:not_single_dispatch:Unused argument 'arg':HIGH
 unused-argument:70:24:70:27:bad_single_dispatch:Unused argument 'arg':HIGH
-function-redefined:75:0:76:13:bad_single_dispatch:function already defined line 70:UNDEFINED
+function-redefined:75:0:75:23:bad_single_dispatch:function already defined line 70:UNDEFINED
 unused-argument:75:24:75:27:bad_single_dispatch:Unused argument 'arg':HIGH
diff --git a/tests/functional/s/slots_checks.txt b/tests/functional/s/slots_checks.txt
index c3069131b9..17b3195522 100644
--- a/tests/functional/s/slots_checks.txt
+++ b/tests/functional/s/slots_checks.txt
@@ -1,11 +1,11 @@
-invalid-slots:36:0:37:20:Bad:Invalid __slots__ object:UNDEFINED
-invalid-slots:39:0:40:17:SecondBad:Invalid __slots__ object:UNDEFINED
+invalid-slots:36:0:36:9:Bad:Invalid __slots__ object:UNDEFINED
+invalid-slots:39:0:39:15:SecondBad:Invalid __slots__ object:UNDEFINED
 invalid-slots-object:43:22:43:23:ThirdBad:Invalid object '2' in __slots__, must contain only non empty strings:UNDEFINED
-invalid-slots:45:0:46:29:FourthBad:Invalid __slots__ object:UNDEFINED
+invalid-slots:45:0:45:15:FourthBad:Invalid __slots__ object:UNDEFINED
 invalid-slots-object:49:27:49:29:FifthBad:"Invalid object ""''"" in __slots__, must contain only non empty strings":UNDEFINED
-single-string-used-for-slots:51:0:52:19:SixthBad:Class __slots__ should be a non-string iterable:UNDEFINED
-single-string-used-for-slots:54:0:55:23:SeventhBad:Class __slots__ should be a non-string iterable:UNDEFINED
-single-string-used-for-slots:57:0:58:30:EighthBad:Class __slots__ should be a non-string iterable:UNDEFINED
+single-string-used-for-slots:51:0:51:14:SixthBad:Class __slots__ should be a non-string iterable:UNDEFINED
+single-string-used-for-slots:54:0:54:16:SeventhBad:Class __slots__ should be a non-string iterable:UNDEFINED
+single-string-used-for-slots:57:0:57:15:EighthBad:Class __slots__ should be a non-string iterable:UNDEFINED
 class-variable-slots-conflict:85:17:85:24:ValueInSlotConflict:Value 'first' in slots conflicts with class variable:UNDEFINED
 class-variable-slots-conflict:85:45:85:53:ValueInSlotConflict:Value 'fourth' in slots conflicts with class variable:UNDEFINED
 class-variable-slots-conflict:85:36:85:43:ValueInSlotConflict:Value 'third' in slots conflicts with class variable:UNDEFINED
diff --git a/tests/functional/s/socketerror_import.txt b/tests/functional/s/socketerror_import.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/s/string/string_formatting_failed_inference.txt b/tests/functional/s/string/string_formatting_failed_inference.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/s/string/string_formatting_failed_inference_py35.txt b/tests/functional/s/string/string_formatting_failed_inference_py35.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/s/subclassed_final_class_py38.txt b/tests/functional/s/subclassed_final_class_py38.txt
index d7de834b1d..9dec8110e8 100644
--- a/tests/functional/s/subclassed_final_class_py38.txt
+++ b/tests/functional/s/subclassed_final_class_py38.txt
@@ -1 +1 @@
-subclassed-final-class:14:0:15:8:Subclass:"Class 'Subclass' is a subclass of a class decorated with typing.final: 'Base'":UNDEFINED
+subclassed-final-class:14:0:14:14:Subclass:"Class 'Subclass' is a subclass of a class decorated with typing.final: 'Base'":UNDEFINED
diff --git a/tests/functional/s/super/super_init_not_called.txt b/tests/functional/s/super/super_init_not_called.txt
index b6a220c69f..615b24a542 100644
--- a/tests/functional/s/super/super_init_not_called.txt
+++ b/tests/functional/s/super/super_init_not_called.txt
@@ -1,2 +1,2 @@
 undefined-variable:18:23:18:40:UninferableChild:Undefined variable 'UninferableParent':UNDEFINED
-super-init-not-called:49:4:50:11:ChildThree.__init__:__init__ method from base class 'ParentWithoutInit' is not called:INFERENCE
+super-init-not-called:49:4:49:16:ChildThree.__init__:__init__ method from base class 'ParentWithoutInit' is not called:INFERENCE
diff --git a/tests/functional/s/super/super_init_not_called_extensions_py310.txt b/tests/functional/s/super/super_init_not_called_extensions_py310.txt
index 6a8ad14fe6..b80cb80be4 100644
--- a/tests/functional/s/super/super_init_not_called_extensions_py310.txt
+++ b/tests/functional/s/super/super_init_not_called_extensions_py310.txt
@@ -1 +1 @@
-super-init-not-called:21:4:22:11:TestChild.__init__:__init__ method from base class 'TestParent' is not called:INFERENCE
+super-init-not-called:21:4:21:16:TestChild.__init__:__init__ method from base class 'TestParent' is not called:INFERENCE
diff --git a/tests/functional/s/super/super_init_not_called_py38.txt b/tests/functional/s/super/super_init_not_called_py38.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/s/symlink/_binding/symlink_module.txt b/tests/functional/s/symlink/_binding/symlink_module.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/s/symlink/symlink_module/symlink_module.txt b/tests/functional/s/symlink/symlink_module/symlink_module.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/t/test_compile.txt b/tests/functional/t/test_compile.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/t/too/too_few_public_methods.txt b/tests/functional/t/too/too_few_public_methods.txt
index 854a780785..24f46d08f9 100644
--- a/tests/functional/t/too/too_few_public_methods.txt
+++ b/tests/functional/t/too/too_few_public_methods.txt
@@ -1 +1 @@
-too-few-public-methods:8:0:17:19:Aaaa:Too few public methods (1/2):UNDEFINED
+too-few-public-methods:8:0:8:10:Aaaa:Too few public methods (1/2):UNDEFINED
diff --git a/tests/functional/t/too/too_few_public_methods_37.txt b/tests/functional/t/too/too_few_public_methods_37.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/t/too/too_few_public_methods_excluded.txt b/tests/functional/t/too/too_few_public_methods_excluded.txt
index 00ceaea786..b007f9b183 100644
--- a/tests/functional/t/too/too_few_public_methods_excluded.txt
+++ b/tests/functional/t/too/too_few_public_methods_excluded.txt
@@ -1 +1 @@
-too-few-public-methods:4:0:5:7:Control:Too few public methods (0/10):UNDEFINED
+too-few-public-methods:4:0:4:13:Control:Too few public methods (0/10):UNDEFINED
diff --git a/tests/functional/t/too/too_many_ancestors.txt b/tests/functional/t/too/too_many_ancestors.txt
index 204e2e5993..b4d4ecd6f5 100644
--- a/tests/functional/t/too/too_many_ancestors.txt
+++ b/tests/functional/t/too/too_many_ancestors.txt
@@ -1,2 +1,2 @@
-too-many-ancestors:21:0:22:8:Iiii:Too many ancestors (8/7):UNDEFINED
-too-many-ancestors:24:0:25:8:Jjjj:Too many ancestors (9/7):UNDEFINED
+too-many-ancestors:21:0:21:10:Iiii:Too many ancestors (8/7):UNDEFINED
+too-many-ancestors:24:0:24:10:Jjjj:Too many ancestors (9/7):UNDEFINED
diff --git a/tests/functional/t/too/too_many_ancestors_ignored_parents.txt b/tests/functional/t/too/too_many_ancestors_ignored_parents.txt
index 6ba1a7d296..fcbafdeb05 100644
--- a/tests/functional/t/too/too_many_ancestors_ignored_parents.txt
+++ b/tests/functional/t/too/too_many_ancestors_ignored_parents.txt
@@ -1 +1 @@
-too-many-ancestors:39:0:40:19:A:Too many ancestors (3/2):UNDEFINED
+too-many-ancestors:39:0:39:7:A:Too many ancestors (3/2):UNDEFINED
diff --git a/tests/functional/t/too/too_many_arguments.txt b/tests/functional/t/too/too_many_arguments.txt
index 71d1bfd395..f9749e9495 100644
--- a/tests/functional/t/too/too_many_arguments.txt
+++ b/tests/functional/t/too/too_many_arguments.txt
@@ -1 +1 @@
-too-many-arguments:3:0:4:63:stupid_function:Too many arguments (9/5):UNDEFINED
+too-many-arguments:3:0:3:19:stupid_function:Too many arguments (9/5):UNDEFINED
diff --git a/tests/functional/t/too/too_many_arguments_issue_1045.txt b/tests/functional/t/too/too_many_arguments_issue_1045.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/t/too/too_many_arguments_overload.txt b/tests/functional/t/too/too_many_arguments_overload.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/t/too/too_many_branches.txt b/tests/functional/t/too/too_many_branches.txt
index f74a70b6aa..3d37bb6df5 100644
--- a/tests/functional/t/too/too_many_branches.txt
+++ b/tests/functional/t/too/too_many_branches.txt
@@ -1 +1 @@
-too-many-branches:3:0:30:12:wrong:Too many branches (13/12):UNDEFINED
+too-many-branches:3:0:3:9:wrong:Too many branches (13/12):UNDEFINED
diff --git a/tests/functional/t/too/too_many_function_args.txt b/tests/functional/t/too/too_many_function_args.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/t/too/too_many_instance_attributes.txt b/tests/functional/t/too/too_many_instance_attributes.txt
index fd1e2e58e5..d3f1282228 100644
--- a/tests/functional/t/too/too_many_instance_attributes.txt
+++ b/tests/functional/t/too/too_many_instance_attributes.txt
@@ -1 +1 @@
-too-many-instance-attributes:4:0:27:26:Aaaa:Too many instance attributes (21/7):UNDEFINED
+too-many-instance-attributes:4:0:4:10:Aaaa:Too many instance attributes (21/7):UNDEFINED
diff --git a/tests/functional/t/too/too_many_instance_attributes_py37.txt b/tests/functional/t/too/too_many_instance_attributes_py37.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/t/too/too_many_lines_disabled.txt b/tests/functional/t/too/too_many_lines_disabled.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/t/too/too_many_locals.txt b/tests/functional/t/too/too_many_locals.txt
index 5d2055c0c3..19272626f1 100644
--- a/tests/functional/t/too/too_many_locals.txt
+++ b/tests/functional/t/too/too_many_locals.txt
@@ -1,3 +1,3 @@
-too-many-locals:4:0:9:51:function:Too many local variables (16/15):UNDEFINED
-too-many-locals:12:0:30:17:too_many_locals_function:Too many local variables (16/15):UNDEFINED
-too-many-arguments:32:0:39:15:too_many_arguments_function:Too many arguments (6/5):UNDEFINED
+too-many-locals:4:0:4:12:function:Too many local variables (16/15):UNDEFINED
+too-many-locals:12:0:12:28:too_many_locals_function:Too many local variables (16/15):UNDEFINED
+too-many-arguments:32:0:32:31:too_many_arguments_function:Too many arguments (6/5):UNDEFINED
diff --git a/tests/functional/t/too/too_many_public_methods.txt b/tests/functional/t/too/too_many_public_methods.txt
index 799640bbb1..2d5ac78ba4 100644
--- a/tests/functional/t/too/too_many_public_methods.txt
+++ b/tests/functional/t/too/too_many_public_methods.txt
@@ -1 +1 @@
-too-many-public-methods:3:0:72:24:Aaaa:Too many public methods (21/20):UNDEFINED
+too-many-public-methods:3:0:3:10:Aaaa:Too many public methods (21/20):UNDEFINED
diff --git a/tests/functional/t/too/too_many_return_statements.txt b/tests/functional/t/too/too_many_return_statements.txt
index 5e4de80285..815cacf28e 100644
--- a/tests/functional/t/too/too_many_return_statements.txt
+++ b/tests/functional/t/too/too_many_return_statements.txt
@@ -1 +1 @@
-too-many-return-statements:3:0:24:15:stupid_function:Too many return statements (11/6):UNDEFINED
+too-many-return-statements:3:0:3:19:stupid_function:Too many return statements (11/6):UNDEFINED
diff --git a/tests/functional/t/too/too_many_statements.txt b/tests/functional/t/too/too_many_statements.txt
index 0e74c361ba..b78c4b9a54 100644
--- a/tests/functional/t/too/too_many_statements.txt
+++ b/tests/functional/t/too/too_many_statements.txt
@@ -1,3 +1,3 @@
-too-many-statements:5:0:60:16:stupid_function:Too many statements (55/5):UNDEFINED
-too-many-statements:62:0:125:13:long_function_with_inline_def:Too many statements (62/5):UNDEFINED
-too-many-statements:128:0:133:12:exmaple_function:Too many statements (6/5):UNDEFINED
+too-many-statements:5:0:5:19:stupid_function:Too many statements (55/5):UNDEFINED
+too-many-statements:62:0:62:33:long_function_with_inline_def:Too many statements (62/5):UNDEFINED
+too-many-statements:128:0:128:20:exmaple_function:Too many statements (6/5):UNDEFINED
diff --git a/tests/functional/t/typedDict.txt b/tests/functional/t/typedDict.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/t/typing_generic.txt b/tests/functional/t/typing_generic.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/t/typing_use.txt b/tests/functional/t/typing_use.txt
index 26d353a526..0007db21d5 100644
--- a/tests/functional/t/typing_use.txt
+++ b/tests/functional/t/typing_use.txt
@@ -1 +1 @@
-function-redefined:21:0:23:18:double_with_docstring:function already defined line 16:UNDEFINED
+function-redefined:21:0:21:25:double_with_docstring:function already defined line 16:UNDEFINED
diff --git a/tests/functional/u/unbalanced_tuple_unpacking_py30.txt b/tests/functional/u/unbalanced_tuple_unpacking_py30.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/u/undefined/undefined_variable_classes.txt b/tests/functional/u/undefined/undefined_variable_classes.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/u/undefined/undefined_variable_crash_on_attribute.txt b/tests/functional/u/undefined/undefined_variable_crash_on_attribute.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/u/undefined/undefined_variable_decorators.txt b/tests/functional/u/undefined/undefined_variable_decorators.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/u/undefined/undefined_variable_py30.txt b/tests/functional/u/undefined/undefined_variable_py30.txt
index 364b5a1487..31c1ef9f49 100644
--- a/tests/functional/u/undefined/undefined_variable_py30.txt
+++ b/tests/functional/u/undefined/undefined_variable_py30.txt
@@ -4,7 +4,7 @@ undefined-variable:36:25:36:28:Undefined1.InnerScope.test1:Undefined variable 'A
 undefined-variable:51:28:51:32:FalsePositive342.test_bad:Undefined variable 'trop':UNDEFINED
 undefined-variable:54:31:54:36:FalsePositive342.test_bad1:Undefined variable 'trop1':UNDEFINED
 undefined-variable:57:31:57:36:FalsePositive342.test_bad2:Undefined variable 'trop2':UNDEFINED
-undefined-variable:63:0:64:27:Bad:Undefined variable 'ABCMet':UNDEFINED
-undefined-variable:66:0:67:35:SecondBad:Undefined variable 'ab':UNDEFINED
+undefined-variable:63:0:63:9:Bad:Undefined variable 'ABCMet':UNDEFINED
+undefined-variable:66:0:66:15:SecondBad:Undefined variable 'ab':UNDEFINED
 undefined-variable:97:53:97:61:InheritingClass:Undefined variable 'variable':UNDEFINED
-undefined-variable:103:0:104:8:Inheritor:Undefined variable 'DefinedTooLate':UNDEFINED
+undefined-variable:103:0:103:15:Inheritor:Undefined variable 'DefinedTooLate':UNDEFINED
diff --git a/tests/functional/u/undefined/undefined_variable_typing.txt b/tests/functional/u/undefined/undefined_variable_typing.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/u/unexpected_special_method_signature.txt b/tests/functional/u/unexpected_special_method_signature.txt
index 9751b6447e..dd9297f16d 100644
--- a/tests/functional/u/unexpected_special_method_signature.txt
+++ b/tests/functional/u/unexpected_special_method_signature.txt
@@ -1,16 +1,16 @@
-unexpected-special-method-signature:8:4:9:12:Invalid.__enter__:The special method '__enter__' expects 0 param(s), 1 was given:UNDEFINED
-unexpected-special-method-signature:11:4:12:12:Invalid.__del__:The special method '__del__' expects 0 param(s), 1 was given:UNDEFINED
-unexpected-special-method-signature:14:4:15:12:Invalid.__format__:The special method '__format__' expects 1 param(s), 2 were given:UNDEFINED
-unexpected-special-method-signature:17:4:18:12:Invalid.__setattr__:The special method '__setattr__' expects 2 param(s), 0 was given:UNDEFINED
-unexpected-special-method-signature:20:4:21:12:Invalid.__round__:The special method '__round__' expects between 0 or 1 param(s), 2 were given:UNDEFINED
-unexpected-special-method-signature:23:4:24:12:Invalid.__deepcopy__:The special method '__deepcopy__' expects 1 param(s), 2 were given:UNDEFINED
-no-method-argument:26:4:27:12:Invalid.__iter__:Method has no argument:UNDEFINED
-unexpected-special-method-signature:30:4:31:12:Invalid.__getattr__:The special method '__getattr__' expects 1 param(s), 2 were given:UNDEFINED
-unexpected-special-method-signature:37:4:38:12:FirstBadContextManager.__exit__:The special method '__exit__' expects 3 param(s), 1 was given:UNDEFINED
-unexpected-special-method-signature:43:4:44:12:SecondBadContextManager.__exit__:The special method '__exit__' expects 3 param(s), 4 were given:UNDEFINED
-unexpected-special-method-signature:51:4:52:12:ThirdBadContextManager.__exit__:The special method '__exit__' expects 3 param(s), 4 were given:UNDEFINED
-unexpected-special-method-signature:57:4:58:12:Async.__aiter__:The special method '__aiter__' expects 0 param(s), 1 was given:UNDEFINED
-unexpected-special-method-signature:59:4:60:12:Async.__anext__:The special method '__anext__' expects 0 param(s), 2 were given:UNDEFINED
-unexpected-special-method-signature:61:4:62:12:Async.__await__:The special method '__await__' expects 0 param(s), 1 was given:UNDEFINED
-unexpected-special-method-signature:63:4:64:12:Async.__aenter__:The special method '__aenter__' expects 0 param(s), 1 was given:UNDEFINED
-unexpected-special-method-signature:65:4:66:12:Async.__aexit__:The special method '__aexit__' expects 3 param(s), 0 was given:UNDEFINED
+unexpected-special-method-signature:8:4:8:17:Invalid.__enter__:The special method '__enter__' expects 0 param(s), 1 was given:UNDEFINED
+unexpected-special-method-signature:11:4:11:15:Invalid.__del__:The special method '__del__' expects 0 param(s), 1 was given:UNDEFINED
+unexpected-special-method-signature:14:4:14:18:Invalid.__format__:The special method '__format__' expects 1 param(s), 2 were given:UNDEFINED
+unexpected-special-method-signature:17:4:17:19:Invalid.__setattr__:The special method '__setattr__' expects 2 param(s), 0 was given:UNDEFINED
+unexpected-special-method-signature:20:4:20:17:Invalid.__round__:The special method '__round__' expects between 0 or 1 param(s), 2 were given:UNDEFINED
+unexpected-special-method-signature:23:4:23:20:Invalid.__deepcopy__:The special method '__deepcopy__' expects 1 param(s), 2 were given:UNDEFINED
+no-method-argument:26:4:26:16:Invalid.__iter__:Method has no argument:UNDEFINED
+unexpected-special-method-signature:30:4:30:19:Invalid.__getattr__:The special method '__getattr__' expects 1 param(s), 2 were given:UNDEFINED
+unexpected-special-method-signature:37:4:37:16:FirstBadContextManager.__exit__:The special method '__exit__' expects 3 param(s), 1 was given:UNDEFINED
+unexpected-special-method-signature:43:4:43:16:SecondBadContextManager.__exit__:The special method '__exit__' expects 3 param(s), 4 were given:UNDEFINED
+unexpected-special-method-signature:51:4:51:16:ThirdBadContextManager.__exit__:The special method '__exit__' expects 3 param(s), 4 were given:UNDEFINED
+unexpected-special-method-signature:57:4:57:17:Async.__aiter__:The special method '__aiter__' expects 0 param(s), 1 was given:UNDEFINED
+unexpected-special-method-signature:59:4:59:17:Async.__anext__:The special method '__anext__' expects 0 param(s), 2 were given:UNDEFINED
+unexpected-special-method-signature:61:4:61:17:Async.__await__:The special method '__await__' expects 0 param(s), 1 was given:UNDEFINED
+unexpected-special-method-signature:63:4:63:18:Async.__aenter__:The special method '__aenter__' expects 0 param(s), 1 was given:UNDEFINED
+unexpected-special-method-signature:65:4:65:17:Async.__aexit__:The special method '__aexit__' expects 3 param(s), 0 was given:UNDEFINED
diff --git a/tests/functional/u/ungrouped_imports_isort_compatible.txt b/tests/functional/u/ungrouped_imports_isort_compatible.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/u/uninferable_all_object.txt b/tests/functional/u/uninferable_all_object.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/u/unpacking/unpacking.txt b/tests/functional/u/unpacking/unpacking.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/u/unpacking/unpacking_non_sequence_py37.txt b/tests/functional/u/unpacking/unpacking_non_sequence_py37.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/u/unsubscriptable_object.txt b/tests/functional/u/unsubscriptable_object.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/u/unused/unused_global_variable1.txt b/tests/functional/u/unused/unused_global_variable1.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/u/unused/unused_global_variable3.txt b/tests/functional/u/unused/unused_global_variable3.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/u/unused/unused_import_assigned_to.txt b/tests/functional/u/unused/unused_import_assigned_to.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/u/unused/unused_import_class_def_keyword.txt b/tests/functional/u/unused/unused_import_class_def_keyword.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/u/unused/unused_import_everything_disabled.txt b/tests/functional/u/unused/unused_import_everything_disabled.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/u/unused/unused_import_positional_only_py38.txt b/tests/functional/u/unused/unused_import_positional_only_py38.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/u/unused/unused_module.txt b/tests/functional/u/unused/unused_module.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/u/unused/unused_private_member.txt b/tests/functional/u/unused/unused_private_member.txt
index 99f34b7f53..71c95c9764 100644
--- a/tests/functional/u/unused/unused_private_member.txt
+++ b/tests/functional/u/unused/unused_private_member.txt
@@ -1,20 +1,20 @@
-unused-private-member:4:4:5:12:AnotherClass.__test:Unused private member `AnotherClass.__test(self)`:UNDEFINED
+unused-private-member:4:4:4:14:AnotherClass.__test:Unused private member `AnotherClass.__test(self)`:UNDEFINED
 unused-private-member:8:4:8:15:HasUnusedInClass:Unused private member `HasUnusedInClass.__my_secret`:UNDEFINED
-unused-private-member:12:4:13:35:HasUnusedInClass.__private_class_method_unused:Unused private member `HasUnusedInClass.__private_class_method_unused(cls)`:UNDEFINED
-unused-private-member:20:4:21:12:HasUnusedInClass.__private_static_method_unused:Unused private member `HasUnusedInClass.__private_static_method_unused()`:UNDEFINED
+unused-private-member:12:4:12:37:HasUnusedInClass.__private_class_method_unused:Unused private member `HasUnusedInClass.__private_class_method_unused(cls)`:UNDEFINED
+unused-private-member:20:4:20:38:HasUnusedInClass.__private_static_method_unused:Unused private member `HasUnusedInClass.__private_static_method_unused()`:UNDEFINED
 unused-private-member:28:8:28:30:HasUnusedInClass.__init__:Unused private member `HasUnusedInClass.__instance_secret`:UNDEFINED
-unused-private-member:34:4:38:13:HasUnusedInClass.__test:Unused private member `HasUnusedInClass.__test(self, x, y, z)`:UNDEFINED
-unused-private-member:55:4:56:31:HasUnusedInClass.__test_recursive:Unused private member `HasUnusedInClass.__test_recursive(self)`:UNDEFINED
+unused-private-member:34:4:34:14:HasUnusedInClass.__test:Unused private member `HasUnusedInClass.__test(self, x, y, z)`:UNDEFINED
+unused-private-member:55:4:55:24:HasUnusedInClass.__test_recursive:Unused private member `HasUnusedInClass.__test_recursive(self)`:UNDEFINED
 unused-private-member:133:8:133:21:FalsePositive4657.__init__:Unused private member `FalsePositive4657.__attr_c`:UNDEFINED
 undefined-variable:138:15:138:18:FalsePositive4657.attr_c:Undefined variable 'cls':UNDEFINED
 unused-private-member:157:8:157:26:FalsePositive4668.__new__:Unused private member `FalsePositive4668.__unused`:UNDEFINED
-unused-private-member:181:8:182:27:FalsePositive4673.do_thing.__true_positive:Unused private member `FalsePositive4673.do_thing.__true_positive(in_thing)`:UNDEFINED
-unused-private-member:201:8:202:16:FalsePositive4673.complicated_example.__inner_4:Unused private member `FalsePositive4673.complicated_example.__inner_4()`:UNDEFINED
+unused-private-member:181:8:181:27:FalsePositive4673.do_thing.__true_positive:Unused private member `FalsePositive4673.do_thing.__true_positive(in_thing)`:UNDEFINED
+unused-private-member:201:8:201:21:FalsePositive4673.complicated_example.__inner_4:Unused private member `FalsePositive4673.complicated_example.__inner_4()`:UNDEFINED
 unused-private-member:212:8:212:23:Crash4755Context.__init__:Unused private member `Crash4755Context.__messages`:UNDEFINED
 unused-private-member:229:4:229:24:FalsePositive4681:Unused private member `FalsePositive4681.__should_cause_error`:UNDEFINED
 unused-private-member:239:12:239:50:FalsePositive4681.__init__:Unused private member `FalsePositive4681.__should_cause_error`:UNDEFINED
 unused-private-member:243:12:243:50:FalsePositive4681.__init__:Unused private member `FalsePositive4681.__should_cause_error`:UNDEFINED
-unused-private-member:274:4:275:26:FalsePositive4849.__unused_private_method:Unused private member `FalsePositive4849.__unused_private_method()`:UNDEFINED
-unused-private-member:291:4:294:44:Pony.__init_defaults:Unused private member `Pony.__init_defaults(self)`:UNDEFINED
-unused-private-member:296:4:298:20:Pony.__get_fur_color:Unused private member `Pony.__get_fur_color(self)`:UNDEFINED
+unused-private-member:274:4:274:31:FalsePositive4849.__unused_private_method:Unused private member `FalsePositive4849.__unused_private_method()`:UNDEFINED
+unused-private-member:291:4:291:23:Pony.__init_defaults:Unused private member `Pony.__init_defaults(self)`:UNDEFINED
+unused-private-member:296:4:296:23:Pony.__get_fur_color:Unused private member `Pony.__get_fur_color(self)`:UNDEFINED
 unused-private-member:318:8:318:15:TypeSelfCallInMethod.b:Unused private member `TypeSelfCallInMethod.__a`:UNDEFINED
diff --git a/tests/functional/u/unused/unused_typing_imports.txt b/tests/functional/u/unused/unused_typing_imports.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/u/unused/unused_variable_py36.txt b/tests/functional/u/unused/unused_variable_py36.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/u/unused/unused_variable_py38.txt b/tests/functional/u/unused/unused_variable_py38.txt
index 62a9e8b6ce..c870838e6e 100644
--- a/tests/functional/u/unused/unused_variable_py38.txt
+++ b/tests/functional/u/unused/unused_variable_py38.txt
@@ -1,6 +1,6 @@
-unused-variable:4:0:8:16:typed_assignment_in_function_default:Unused variable 'typed_assignment_in_function_default':UNDEFINED
+unused-variable:4:0:4:40:typed_assignment_in_function_default:Unused variable 'typed_assignment_in_function_default':UNDEFINED
 unused-variable:5:18:5:31::Unused variable 'typed_default':UNDEFINED
-unused-variable:11:0:15:16:assignment_in_function_default:Unused variable 'assignment_in_function_default':UNDEFINED
+unused-variable:11:0:11:34:assignment_in_function_default:Unused variable 'assignment_in_function_default':UNDEFINED
 unused-variable:12:11:12:18::Unused variable 'default':UNDEFINED
-unused-variable:18:0:23:16:assignment_used_in_function_scope:Unused variable 'assignment_used_in_function_scope':UNDEFINED
-unused-variable:26:0:30:16:assignment_used_in_global_scope:Unused variable 'assignment_used_in_global_scope':UNDEFINED
+unused-variable:18:0:18:37:assignment_used_in_function_scope:Unused variable 'assignment_used_in_function_scope':UNDEFINED
+unused-variable:26:0:26:35:assignment_used_in_global_scope:Unused variable 'assignment_used_in_global_scope':UNDEFINED
diff --git a/tests/functional/u/use/use_symbolic_message_instead.txt b/tests/functional/u/use/use_symbolic_message_instead.txt
index bbc1f24bd4..5a01b7cdbe 100644
--- a/tests/functional/u/use/use_symbolic_message_instead.txt
+++ b/tests/functional/u/use/use_symbolic_message_instead.txt
@@ -3,12 +3,12 @@ use-symbolic-message-instead:1:0:None:None::"'C0111' is cryptic: use '# pylint:
 use-symbolic-message-instead:1:0:None:None::"'R0903' is cryptic: use '# pylint: disable=too-few-public-methods' instead":UNDEFINED
 use-symbolic-message-instead:2:0:None:None::"'c0111' is cryptic: use '# pylint: enable=missing-docstring' instead":UNDEFINED
 use-symbolic-message-instead:2:0:None:None::"'w0223' is cryptic: use '# pylint: enable=abstract-method' instead":UNDEFINED
-missing-function-docstring:4:0:5:22:my_function:Missing function or method docstring:HIGH
+missing-function-docstring:4:0:4:15:my_function:Missing function or method docstring:HIGH
 use-symbolic-message-instead:7:0:None:None::"'C0111' is cryptic: use '# pylint: disable=missing-docstring' instead":UNDEFINED
 use-symbolic-message-instead:8:0:None:None::"'R0903' is cryptic: use '# pylint: enable=too-few-public-methods' instead":UNDEFINED
 use-symbolic-message-instead:9:0:None:None::"'R0903' is cryptic: use '# pylint: disable=too-few-public-methods' instead":UNDEFINED
 use-symbolic-message-instead:12:0:None:None::"'C0102' is cryptic: use '# pylint: disable=blacklisted-name' instead":UNDEFINED
 use-symbolic-message-instead:16:0:None:None::"'C0102' is cryptic: use '# pylint: disable=blacklisted-name' instead":UNDEFINED
 use-symbolic-message-instead:16:0:None:None::"'R1711' is cryptic: use '# pylint: disable=useless-return' instead":UNDEFINED
-missing-function-docstring:20:0:21:8:test_enabled_by_id_msg:Missing function or method docstring:HIGH
+missing-function-docstring:20:0:20:26:test_enabled_by_id_msg:Missing function or method docstring:HIGH
 use-symbolic-message-instead:20:0:None:None::"'C0111' is cryptic: use '# pylint: enable=missing-docstring' instead":UNDEFINED
diff --git a/tests/functional/u/use/used_before_assignment_except_handler_for_try_with_return_py38.txt b/tests/functional/u/use/used_before_assignment_except_handler_for_try_with_return_py38.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/u/used/used_before_assignment_488.txt b/tests/functional/u/used/used_before_assignment_488.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/u/used/used_before_assignment_filtered_comprehension.txt b/tests/functional/u/used/used_before_assignment_filtered_comprehension.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/u/used/used_before_assignment_issue853.txt b/tests/functional/u/used/used_before_assignment_issue853.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/u/useless/useless_object_inheritance.txt b/tests/functional/u/useless/useless_object_inheritance.txt
index fe3bd2e4a8..67f48417f9 100644
--- a/tests/functional/u/useless/useless_object_inheritance.txt
+++ b/tests/functional/u/useless/useless_object_inheritance.txt
@@ -1,4 +1,4 @@
-useless-object-inheritance:8:0:9:8:A:Class 'A' inherits from object, can be safely removed from bases in python3:UNDEFINED
-useless-object-inheritance:14:0:15:8:C:Class 'C' inherits from object, can be safely removed from bases in python3:UNDEFINED
-useless-object-inheritance:17:0:18:8:D:Class 'D' inherits from object, can be safely removed from bases in python3:UNDEFINED
-useless-object-inheritance:20:0:21:8:E:Class 'E' inherits from object, can be safely removed from bases in python3:UNDEFINED
+useless-object-inheritance:8:0:8:7:A:Class 'A' inherits from object, can be safely removed from bases in python3:UNDEFINED
+useless-object-inheritance:14:0:14:7:C:Class 'C' inherits from object, can be safely removed from bases in python3:UNDEFINED
+useless-object-inheritance:17:0:17:7:D:Class 'D' inherits from object, can be safely removed from bases in python3:UNDEFINED
+useless-object-inheritance:20:0:20:7:E:Class 'E' inherits from object, can be safely removed from bases in python3:UNDEFINED
diff --git a/tests/functional/u/useless/useless_return.txt b/tests/functional/u/useless/useless_return.txt
index b64b76be4d..035e951ab2 100644
--- a/tests/functional/u/useless/useless_return.txt
+++ b/tests/functional/u/useless/useless_return.txt
@@ -1,2 +1,2 @@
-useless-return:4:0:6:10:myfunc:Useless return at end of function or method:UNDEFINED
-useless-return:9:4:11:19:SomeClass.mymethod:Useless return at end of function or method:UNDEFINED
+useless-return:4:0:4:10:myfunc:Useless return at end of function or method:UNDEFINED
+useless-return:9:4:9:16:SomeClass.mymethod:Useless return at end of function or method:UNDEFINED
diff --git a/tests/functional/u/useless/useless_super_delegation.txt b/tests/functional/u/useless/useless_super_delegation.txt
index 43f52674a9..b69febe691 100644
--- a/tests/functional/u/useless/useless_super_delegation.txt
+++ b/tests/functional/u/useless/useless_super_delegation.txt
@@ -1,19 +1,19 @@
-useless-super-delegation:214:4:215:60:UselessSuper.equivalent_params:Useless super delegation in method 'equivalent_params':UNDEFINED
-useless-super-delegation:217:4:218:67:UselessSuper.equivalent_params_1:Useless super delegation in method 'equivalent_params_1':UNDEFINED
-useless-super-delegation:220:4:221:67:UselessSuper.equivalent_params_2:Useless super delegation in method 'equivalent_params_2':UNDEFINED
-useless-super-delegation:223:4:224:77:UselessSuper.equivalent_params_3:Useless super delegation in method 'equivalent_params_3':UNDEFINED
-useless-super-delegation:226:4:227:60:UselessSuper.equivalent_params_4:Useless super delegation in method 'equivalent_params_4':UNDEFINED
-useless-super-delegation:229:4:230:67:UselessSuper.equivalent_params_5:Useless super delegation in method 'equivalent_params_5':UNDEFINED
-useless-super-delegation:232:4:233:84:UselessSuper.equivalent_params_6:Useless super delegation in method 'equivalent_params_6':UNDEFINED
-useless-super-delegation:235:4:237:82:UselessSuper.with_default_argument:Useless super delegation in method 'with_default_argument':UNDEFINED
-useless-super-delegation:239:4:240:80:UselessSuper.without_default_argument:Useless super delegation in method 'without_default_argument':UNDEFINED
-useless-super-delegation:242:4:244:80:UselessSuper.with_default_argument_none:Useless super delegation in method 'with_default_argument_none':UNDEFINED
-useless-super-delegation:246:4:247:79:UselessSuper.with_default_argument_int:Useless super delegation in method 'with_default_argument_int':UNDEFINED
-useless-super-delegation:249:4:250:81:UselessSuper.with_default_argument_tuple:Useless super delegation in method 'with_default_argument_tuple':UNDEFINED
-useless-super-delegation:252:4:253:80:UselessSuper.with_default_argument_dict:Useless super delegation in method 'with_default_argument_dict':UNDEFINED
-useless-super-delegation:255:4:256:79:UselessSuper.with_default_argument_var:Useless super delegation in method 'with_default_argument_var':UNDEFINED
-useless-super-delegation:258:4:259:44:UselessSuper.__init__:Useless super delegation in method '__init__':UNDEFINED
-useless-super-delegation:261:4:262:70:UselessSuper.with_default_arg:Useless super delegation in method 'with_default_arg':UNDEFINED
-useless-super-delegation:264:4:265:74:UselessSuper.with_default_arg_bis:Useless super delegation in method 'with_default_arg_bis':UNDEFINED
-useless-super-delegation:267:4:268:74:UselessSuper.with_default_arg_ter:Useless super delegation in method 'with_default_arg_ter':UNDEFINED
-useless-super-delegation:270:4:271:75:UselessSuper.with_default_arg_quad:Useless super delegation in method 'with_default_arg_quad':UNDEFINED
+useless-super-delegation:214:4:214:25:UselessSuper.equivalent_params:Useless super delegation in method 'equivalent_params':UNDEFINED
+useless-super-delegation:217:4:217:27:UselessSuper.equivalent_params_1:Useless super delegation in method 'equivalent_params_1':UNDEFINED
+useless-super-delegation:220:4:220:27:UselessSuper.equivalent_params_2:Useless super delegation in method 'equivalent_params_2':UNDEFINED
+useless-super-delegation:223:4:223:27:UselessSuper.equivalent_params_3:Useless super delegation in method 'equivalent_params_3':UNDEFINED
+useless-super-delegation:226:4:226:27:UselessSuper.equivalent_params_4:Useless super delegation in method 'equivalent_params_4':UNDEFINED
+useless-super-delegation:229:4:229:27:UselessSuper.equivalent_params_5:Useless super delegation in method 'equivalent_params_5':UNDEFINED
+useless-super-delegation:232:4:232:27:UselessSuper.equivalent_params_6:Useless super delegation in method 'equivalent_params_6':UNDEFINED
+useless-super-delegation:235:4:235:29:UselessSuper.with_default_argument:Useless super delegation in method 'with_default_argument':UNDEFINED
+useless-super-delegation:239:4:239:32:UselessSuper.without_default_argument:Useless super delegation in method 'without_default_argument':UNDEFINED
+useless-super-delegation:242:4:242:34:UselessSuper.with_default_argument_none:Useless super delegation in method 'with_default_argument_none':UNDEFINED
+useless-super-delegation:246:4:246:33:UselessSuper.with_default_argument_int:Useless super delegation in method 'with_default_argument_int':UNDEFINED
+useless-super-delegation:249:4:249:35:UselessSuper.with_default_argument_tuple:Useless super delegation in method 'with_default_argument_tuple':UNDEFINED
+useless-super-delegation:252:4:252:34:UselessSuper.with_default_argument_dict:Useless super delegation in method 'with_default_argument_dict':UNDEFINED
+useless-super-delegation:255:4:255:33:UselessSuper.with_default_argument_var:Useless super delegation in method 'with_default_argument_var':UNDEFINED
+useless-super-delegation:258:4:258:16:UselessSuper.__init__:Useless super delegation in method '__init__':UNDEFINED
+useless-super-delegation:261:4:261:24:UselessSuper.with_default_arg:Useless super delegation in method 'with_default_arg':UNDEFINED
+useless-super-delegation:264:4:264:28:UselessSuper.with_default_arg_bis:Useless super delegation in method 'with_default_arg_bis':UNDEFINED
+useless-super-delegation:267:4:267:28:UselessSuper.with_default_arg_ter:Useless super delegation in method 'with_default_arg_ter':UNDEFINED
+useless-super-delegation:270:4:270:29:UselessSuper.with_default_arg_quad:Useless super delegation in method 'with_default_arg_quad':UNDEFINED
diff --git a/tests/functional/u/useless/useless_super_delegation_py3.txt b/tests/functional/u/useless/useless_super_delegation_py3.txt
index bad62c1bda..2497504a06 100644
--- a/tests/functional/u/useless/useless_super_delegation_py3.txt
+++ b/tests/functional/u/useless/useless_super_delegation_py3.txt
@@ -1,2 +1,2 @@
-useless-super-delegation:21:4:22:36:UselessSuper.useless:Useless super delegation in method 'useless':UNDEFINED
-useless-super-delegation:34:4:35:31:Ham.__init__:Useless super delegation in method '__init__':UNDEFINED
+useless-super-delegation:21:4:21:15:UselessSuper.useless:Useless super delegation in method 'useless':UNDEFINED
+useless-super-delegation:34:4:34:16:Ham.__init__:Useless super delegation in method '__init__':UNDEFINED
diff --git a/tests/functional/u/useless/useless_super_delegation_py35.txt b/tests/functional/u/useless/useless_super_delegation_py35.txt
index fdcf74142e..abcf6c5fb4 100644
--- a/tests/functional/u/useless/useless_super_delegation_py35.txt
+++ b/tests/functional/u/useless/useless_super_delegation_py35.txt
@@ -1 +1 @@
-useless-super-delegation:11:4:12:62:UselessSuper.useless:Useless super delegation in method 'useless':UNDEFINED
+useless-super-delegation:11:4:11:15:UselessSuper.useless:Useless super delegation in method 'useless':UNDEFINED
diff --git a/tests/functional/u/useless/useless_super_delegation_py38.txt b/tests/functional/u/useless/useless_super_delegation_py38.txt
index da08eb3a75..1c4631c938 100644
--- a/tests/functional/u/useless/useless_super_delegation_py38.txt
+++ b/tests/functional/u/useless/useless_super_delegation_py38.txt
@@ -1 +1 @@
-useless-super-delegation:16:4:17:39:Ham.__init__:Useless super delegation in method '__init__':UNDEFINED
+useless-super-delegation:16:4:16:16:Ham.__init__:Useless super delegation in method '__init__':UNDEFINED
diff --git a/tests/functional/u/useless/useless_suppression.txt b/tests/functional/u/useless/useless_suppression.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/w/wrong_import_order2.txt b/tests/functional/w/wrong_import_order2.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/w/wrong_import_position10.txt b/tests/functional/w/wrong_import_position10.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/w/wrong_import_position15.txt b/tests/functional/w/wrong_import_position15.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/w/wrong_import_position2.txt b/tests/functional/w/wrong_import_position2.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/w/wrong_import_position3.txt b/tests/functional/w/wrong_import_position3.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/w/wrong_import_position4.txt b/tests/functional/w/wrong_import_position4.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/w/wrong_import_position5.txt b/tests/functional/w/wrong_import_position5.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/w/wrong_import_position6.txt b/tests/functional/w/wrong_import_position6.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/w/wrong_import_position7.txt b/tests/functional/w/wrong_import_position7.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/w/wrong_import_position8.txt b/tests/functional/w/wrong_import_position8.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/w/wrong_import_position9.txt b/tests/functional/w/wrong_import_position9.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/w/wrong_import_position_exclude_dunder_main.txt b/tests/functional/w/wrong_import_position_exclude_dunder_main.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/y/yield_assign.txt b/tests/functional/y/yield_assign.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/y/yield_return_mix.txt b/tests/functional/y/yield_return_mix.txt
new file mode 100644
index 0000000000..e69de29bb2

From 1fd52c42011a173502f7ecdc02e94f2c9d817fe4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20Noord?=
 <13665637+DanielNoord@users.noreply.github.com>
Date: Sat, 12 Mar 2022 16:19:21 +0100
Subject: [PATCH 3/4] Update tests on 3.8

---
 .../g/generic_alias/generic_alias_collections_py37.txt | 10 +++++-----
 .../generic_alias_collections_py37_with_typing.txt     | 10 +++++-----
 .../g/generic_alias/generic_alias_mixed_py37.txt       | 10 +++++-----
 .../generic_alias_postponed_evaluation_py37.txt        | 10 +++++-----
 .../s/super/super_init_not_called_extensions.txt       |  2 +-
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/tests/functional/g/generic_alias/generic_alias_collections_py37.txt b/tests/functional/g/generic_alias/generic_alias_collections_py37.txt
index cd4b30b6f6..84a217d2fc 100644
--- a/tests/functional/g/generic_alias/generic_alias_collections_py37.txt
+++ b/tests/functional/g/generic_alias/generic_alias_collections_py37.txt
@@ -39,7 +39,7 @@ unsubscriptable-object:63:0:63:8::Value 're.Match' is unsubscriptable:UNDEFINED
 unsubscriptable-object:69:0:69:24::Value 'collections.abc.Hashable' is unsubscriptable:UNDEFINED
 unsubscriptable-object:70:0:70:21::Value 'collections.abc.Sized' is unsubscriptable:UNDEFINED
 unsubscriptable-object:73:0:73:26::Value 'collections.abc.ByteString' is unsubscriptable:UNDEFINED
-abstract-method:77:0:78:8:DerivedHashable:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
+abstract-method:77:0:77:21:DerivedHashable:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
 unsubscriptable-object:80:22:80:46:DerivedIterable:Value 'collections.abc.Iterable' is unsubscriptable:UNDEFINED
 unsubscriptable-object:83:24:83:50:DerivedCollection:Value 'collections.abc.Collection' is unsubscriptable:UNDEFINED
 unsubscriptable-object:88:18:88:22:DerivedList:Value 'list' is unsubscriptable:UNDEFINED
@@ -47,11 +47,11 @@ unsubscriptable-object:91:17:91:20:DerivedSet:Value 'set' is unsubscriptable:UND
 unsubscriptable-object:94:25:94:48:DerivedOrderedDict:Value 'collections.OrderedDict' is unsubscriptable:UNDEFINED
 unsubscriptable-object:97:31:97:55:DerivedListIterable:Value 'collections.abc.Iterable' is unsubscriptable:UNDEFINED
 unsubscriptable-object:97:26:97:30:DerivedListIterable:Value 'list' is unsubscriptable:UNDEFINED
-abstract-method:102:0:103:8:DerivedMultiple:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
-abstract-method:102:0:103:8:DerivedMultiple:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
-abstract-method:107:0:108:8:CustomAbstractCls2:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
+abstract-method:102:0:102:21:DerivedMultiple:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
+abstract-method:102:0:102:21:DerivedMultiple:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
+abstract-method:107:0:107:24:CustomAbstractCls2:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
 unsubscriptable-object:107:48:107:72:CustomAbstractCls2:Value 'collections.abc.Iterable' is unsubscriptable:UNDEFINED
-abstract-method:109:0:110:8:CustomImplementation:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
+abstract-method:109:0:109:26:CustomImplementation:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
 unsubscriptable-object:114:11:114:16::Value 'tuple' is unsubscriptable:UNDEFINED
 unsubscriptable-object:115:10:115:14::Value 'dict' is unsubscriptable:UNDEFINED
 unsubscriptable-object:116:17:116:40::Value 'collections.OrderedDict' is unsubscriptable:UNDEFINED
diff --git a/tests/functional/g/generic_alias/generic_alias_collections_py37_with_typing.txt b/tests/functional/g/generic_alias/generic_alias_collections_py37_with_typing.txt
index 2d52319ada..ee1407bdb6 100644
--- a/tests/functional/g/generic_alias/generic_alias_collections_py37_with_typing.txt
+++ b/tests/functional/g/generic_alias/generic_alias_collections_py37_with_typing.txt
@@ -39,7 +39,7 @@ unsubscriptable-object:65:0:65:8::Value 're.Match' is unsubscriptable:UNDEFINED
 unsubscriptable-object:71:0:71:24::Value 'collections.abc.Hashable' is unsubscriptable:UNDEFINED
 unsubscriptable-object:72:0:72:21::Value 'collections.abc.Sized' is unsubscriptable:UNDEFINED
 unsubscriptable-object:75:0:75:26::Value 'collections.abc.ByteString' is unsubscriptable:UNDEFINED
-abstract-method:79:0:80:8:DerivedHashable:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
+abstract-method:79:0:79:21:DerivedHashable:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
 unsubscriptable-object:82:22:82:46:DerivedIterable:Value 'collections.abc.Iterable' is unsubscriptable:UNDEFINED
 unsubscriptable-object:85:24:85:50:DerivedCollection:Value 'collections.abc.Collection' is unsubscriptable:UNDEFINED
 unsubscriptable-object:90:18:90:22:DerivedList:Value 'list' is unsubscriptable:UNDEFINED
@@ -47,11 +47,11 @@ unsubscriptable-object:93:17:93:20:DerivedSet:Value 'set' is unsubscriptable:UND
 unsubscriptable-object:96:25:96:48:DerivedOrderedDict:Value 'collections.OrderedDict' is unsubscriptable:UNDEFINED
 unsubscriptable-object:99:31:99:55:DerivedListIterable:Value 'collections.abc.Iterable' is unsubscriptable:UNDEFINED
 unsubscriptable-object:99:26:99:30:DerivedListIterable:Value 'list' is unsubscriptable:UNDEFINED
-abstract-method:104:0:105:8:DerivedMultiple:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
-abstract-method:104:0:105:8:DerivedMultiple:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
-abstract-method:109:0:110:8:CustomAbstractCls2:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
+abstract-method:104:0:104:21:DerivedMultiple:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
+abstract-method:104:0:104:21:DerivedMultiple:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
+abstract-method:109:0:109:24:CustomAbstractCls2:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
 unsubscriptable-object:109:48:109:72:CustomAbstractCls2:Value 'collections.abc.Iterable' is unsubscriptable:UNDEFINED
-abstract-method:111:0:112:8:CustomImplementation:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
+abstract-method:111:0:111:26:CustomImplementation:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
 unsubscriptable-object:116:11:116:16::Value 'tuple' is unsubscriptable:UNDEFINED
 unsubscriptable-object:117:10:117:14::Value 'dict' is unsubscriptable:UNDEFINED
 unsubscriptable-object:118:17:118:40::Value 'collections.OrderedDict' is unsubscriptable:UNDEFINED
diff --git a/tests/functional/g/generic_alias/generic_alias_mixed_py37.txt b/tests/functional/g/generic_alias/generic_alias_mixed_py37.txt
index c42ad40062..2bafe20ed8 100644
--- a/tests/functional/g/generic_alias/generic_alias_mixed_py37.txt
+++ b/tests/functional/g/generic_alias/generic_alias_mixed_py37.txt
@@ -1,5 +1,5 @@
-abstract-method:34:0:35:8:DerivedHashable:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
-abstract-method:37:0:38:8:DerivedIterable:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
-abstract-method:40:0:41:8:DerivedCollection:Method '__contains__' is abstract in class 'Container' but is not overridden:UNDEFINED
-abstract-method:40:0:41:8:DerivedCollection:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
-abstract-method:40:0:41:8:DerivedCollection:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
+abstract-method:34:0:34:21:DerivedHashable:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
+abstract-method:37:0:37:21:DerivedIterable:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
+abstract-method:40:0:40:23:DerivedCollection:Method '__contains__' is abstract in class 'Container' but is not overridden:UNDEFINED
+abstract-method:40:0:40:23:DerivedCollection:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
+abstract-method:40:0:40:23:DerivedCollection:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
diff --git a/tests/functional/g/generic_alias/generic_alias_postponed_evaluation_py37.txt b/tests/functional/g/generic_alias/generic_alias_postponed_evaluation_py37.txt
index 266644535c..56eca5192b 100644
--- a/tests/functional/g/generic_alias/generic_alias_postponed_evaluation_py37.txt
+++ b/tests/functional/g/generic_alias/generic_alias_postponed_evaluation_py37.txt
@@ -39,7 +39,7 @@ unsubscriptable-object:68:0:68:8::Value 're.Match' is unsubscriptable:UNDEFINED
 unsubscriptable-object:74:0:74:24::Value 'collections.abc.Hashable' is unsubscriptable:UNDEFINED
 unsubscriptable-object:75:0:75:21::Value 'collections.abc.Sized' is unsubscriptable:UNDEFINED
 unsubscriptable-object:78:0:78:26::Value 'collections.abc.ByteString' is unsubscriptable:UNDEFINED
-abstract-method:82:0:83:8:DerivedHashable:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
+abstract-method:82:0:82:21:DerivedHashable:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
 unsubscriptable-object:85:22:85:46:DerivedIterable:Value 'collections.abc.Iterable' is unsubscriptable:UNDEFINED
 unsubscriptable-object:88:24:88:50:DerivedCollection:Value 'collections.abc.Collection' is unsubscriptable:UNDEFINED
 unsubscriptable-object:93:18:93:22:DerivedList:Value 'list' is unsubscriptable:UNDEFINED
@@ -47,10 +47,10 @@ unsubscriptable-object:96:17:96:20:DerivedSet:Value 'set' is unsubscriptable:UND
 unsubscriptable-object:99:25:99:48:DerivedOrderedDict:Value 'collections.OrderedDict' is unsubscriptable:UNDEFINED
 unsubscriptable-object:102:31:102:55:DerivedListIterable:Value 'collections.abc.Iterable' is unsubscriptable:UNDEFINED
 unsubscriptable-object:102:26:102:30:DerivedListIterable:Value 'list' is unsubscriptable:UNDEFINED
-abstract-method:107:0:108:8:DerivedMultiple:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
-abstract-method:107:0:108:8:DerivedMultiple:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
-abstract-method:112:0:113:8:CustomAbstractCls2:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
+abstract-method:107:0:107:21:DerivedMultiple:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
+abstract-method:107:0:107:21:DerivedMultiple:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
+abstract-method:112:0:112:24:CustomAbstractCls2:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
 unsubscriptable-object:112:48:112:72:CustomAbstractCls2:Value 'collections.abc.Iterable' is unsubscriptable:UNDEFINED
-abstract-method:114:0:115:8:CustomImplementation:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
+abstract-method:114:0:114:26:CustomImplementation:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
 unsubscriptable-object:175:19:175:43::Value 'collections.abc.Hashable' is unsubscriptable:UNDEFINED
 unsubscriptable-object:176:16:176:37::Value 'collections.abc.Sized' is unsubscriptable:UNDEFINED
diff --git a/tests/functional/s/super/super_init_not_called_extensions.txt b/tests/functional/s/super/super_init_not_called_extensions.txt
index 6a8ad14fe6..b80cb80be4 100644
--- a/tests/functional/s/super/super_init_not_called_extensions.txt
+++ b/tests/functional/s/super/super_init_not_called_extensions.txt
@@ -1 +1 @@
-super-init-not-called:21:4:22:11:TestChild.__init__:__init__ method from base class 'TestParent' is not called:INFERENCE
+super-init-not-called:21:4:21:16:TestChild.__init__:__init__ method from base class 'TestParent' is not called:INFERENCE

From fb6e3d34af4a93ae1905062b86a2d978a605f13d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20Noord?=
 <13665637+DanielNoord@users.noreply.github.com>
Date: Sat, 12 Mar 2022 16:21:41 +0100
Subject: [PATCH 4/4] Remove unnecessary test files, OOPS

---
 tests/functional/a/abstract/abstract_abc_methods.txt              | 0
 .../a/abstract/abstract_class_instantiated_in_class.txt           | 0
 .../functional/a/access/access_attr_before_def_false_positive.txt | 0
 tests/functional/a/access/access_to_protected_members_typing.txt  | 0
 tests/functional/a/alternative/alternative_union_syntax.txt       | 0
 tests/functional/a/arguments_differ_issue5371.txt                 | 0
 tests/functional/a/assignment/assignment_from_no_return_py3.txt   | 0
 tests/functional/b/bad_reversed_sequence_py38.txt                 | 0
 tests/functional/b/base_init_vars.txt                             | 0
 tests/functional/b/bugfix_local_scope_metaclass_1177.txt          | 0
 tests/functional/b/builtin_module_test.txt                        | 0
 tests/functional/c/class_attributes.txt                           | 0
 tests/functional/c/class_members.txt                              | 0
 tests/functional/c/class_protocol_ellipsis.txt                    | 0
 tests/functional/c/class_variable_slots_conflict_exempted.txt     | 0
 tests/functional/c/classes_meth_could_be_a_function.txt           | 0
 tests/functional/c/classes_protected_member_access.txt            | 0
 tests/functional/c/comparison_with_callable_typing_constants.txt  | 0
 tests/functional/c/consider/consider_using_sys_exit_exempted.txt  | 0
 .../functional/c/consider/consider_using_sys_exit_local_scope.txt | 0
 tests/functional/c/control_pragmas.txt                            | 0
 tests/functional/c/crash_missing_module_type.txt                  | 0
 tests/functional/d/decorator_scope.txt                            | 0
 tests/functional/d/decorator_unused.txt                           | 0
 tests/functional/d/defined_and_used_on_same_line.txt              | 0
 tests/functional/d/deprecated/deprecated_method_suppression.txt   | 0
 tests/functional/d/disable_msg_github_issue_1389.txt              | 0
 tests/functional/d/disable_wrong_import_position.txt              | 0
 tests/functional/d/disabled_msgid_in_pylintrc.txt                 | 0
 tests/functional/e/.#emacs_file_lock.txt                          | 0
 tests/functional/e/.#emacs_file_lock_by_conf.txt                  | 0
 tests/functional/e/e1101_9588_base_attr_aug_assign.txt            | 0
 tests/functional/e/enum_subclasses.txt                            | 0
 tests/functional/e/external_classmethod_crash.txt                 | 0
 tests/functional/ext/code_style/cs_py_version_35.txt              | 0
 tests/functional/ext/docparams/parameter/missing_param_doc.txt    | 0
 .../docparams/parameter/missing_param_doc_required_min_length.txt | 0
 .../missing_param_doc_required_no_doc_rgx_check_none.txt          | 0
 .../parameter/missing_param_doc_required_no_doc_rgx_default.txt   | 0
 .../ext/docparams/raise/missing_raises_doc_required_Google.txt    | 0
 .../ext/docparams/raise/missing_raises_doc_required_Numpy.txt     | 0
 .../ext/docparams/raise/missing_raises_doc_required_Sphinx.txt    | 0
 tests/functional/ext/docparams/return/missing_return_doc.txt      | 0
 tests/functional/ext/docparams/yield/missing_yield_doc.txt        | 0
 tests/functional/ext/docparams/yield/missing_yield_doc_Sphinx.txt | 0
 .../ext/typing/typing_broken_callable_deprecated_alias.txt        | 0
 tests/functional/ext/typing/typing_broken_noreturn_py372.txt      | 0
 tests/functional/f/fallback_import_disabled.txt                   | 0
 tests/functional/f/formatted_string_literal_with_if.txt           | 0
 tests/functional/f/function_redefined_2540.txt                    | 0
 tests/functional/f/future_import.txt                              | 0
 tests/functional/g/genexp_in_class_scope.txt                      | 0
 tests/functional/i/implicit/implicit_str_concat_utf8.txt          | 0
 tests/functional/i/init_return_from_inner_function.txt            | 0
 tests/functional/i/init_subclass_classmethod.txt                  | 0
 tests/functional/i/inner_classes.txt                              | 0
 tests/functional/i/invalid/invalid_all_format_valid_1.txt         | 0
 tests/functional/i/invalid/invalid_all_format_valid_2.txt         | 0
 tests/functional/i/invalid/invalid_all_format_valid_3.txt         | 0
 tests/functional/i/invalid/invalid_all_format_valid_4.txt         | 0
 tests/functional/i/invalid/invalid_all_format_valid_5.txt         | 0
 tests/functional/i/invalid/invalid_all_format_valid_6.txt         | 0
 tests/functional/i/invalid/invalid_metaclass_py3.txt              | 0
 tests/functional/l/lambda_use_before_assign.txt                   | 0
 tests/functional/l/line_too_long_end_of_module.txt                | 0
 tests/functional/l/logging_format_interpolation_style.txt         | 0
 tests/functional/l/long_utf8_lines.txt                            | 0
 .../functional/m/member/member_checks_inference_improvements.txt  | 0
 tests/functional/m/metaclass_attr_access.txt                      | 0
 tests/functional/m/missing/missing_module_docstring_disabled.txt  | 0
 tests/functional/m/missing/missing_module_docstring_empty.txt     | 0
 tests/functional/m/monkeypatch_method.txt                         | 0
 tests/functional/n/no/no_member.txt                               | 0
 tests/functional/n/no/no_member_nested_namedtuple.txt             | 0
 tests/functional/n/no/no_member_subclassed_dataclasses.txt        | 0
 tests/functional/n/no/no_method_argument_py38.txt                 | 0
 tests/functional/n/no/no_self_use_py3.txt                         | 0
 tests/functional/n/no/no_warning_docstring.txt                    | 0
 tests/functional/n/non/non_ascii_name_backward_test_code.txt      | 0
 tests/functional/n/non/non_ascii_name_backward_test_msg.txt       | 0
 tests/functional/n/non/non_parent_init_called.txt                 | 0
 tests/functional/n/non_ascii_import/non_ascii_import.txt          | 0
 tests/functional/n/non_ascii_import/non_ascii_import_as_okay.txt  | 0
 tests/functional/n/non_ascii_name/non_ascii_name_dict_kwargs.txt  | 0
 tests/functional/n/not_async_context_manager_py37.txt             | 0
 tests/functional/o/object_as_class_attribute.txt                  | 0
 tests/functional/o/old_division_floats.txt                        | 0
 tests/functional/o/old_division_manually.txt                      | 0
 tests/functional/o/overloaded_operator.txt                        | 0
 tests/functional/p/pattern_matching.txt                           | 0
 tests/functional/p/postponed_evaluation_activated.txt             | 0
 tests/functional/p/postponed_evaluation_activated_with_alias.txt  | 0
 tests/functional/p/pragma_after_backslash.txt                     | 0
 tests/functional/p/property_affectation_py26.txt                  | 0
 tests/functional/p/py_version_35.txt                              | 0
 tests/functional/r/raising/raising_self.txt                       | 0
 tests/functional/r/recursion/recursion_error_2667.txt             | 0
 tests/functional/r/recursion/recursion_error_2836.txt             | 0
 tests/functional/r/recursion/recursion_error_2861.txt             | 0
 tests/functional/r/recursion/recursion_error_2899.txt             | 0
 tests/functional/r/recursion/recursion_error_2906.txt             | 0
 tests/functional/r/recursion/recursion_error_3152.txt             | 0
 tests/functional/r/recursion/recursion_error_3159.txt             | 0
 tests/functional/r/recursion/recursion_error_940.txt              | 0
 tests/functional/r/recursion/recursion_error_crash.txt            | 0
 tests/functional/r/recursion/recursion_error_crash_2683.txt       | 0
 .../functional/r/recursion/recursion_error_crash_astroid_623.txt  | 0
 tests/functional/r/recursion/recursion_regression_2960.txt        | 0
 .../functional/r/redefined/redefined_outer_name_type_checking.txt | 0
 .../functional/r/regression/regression_1326_crash_uninferable.txt | 0
 tests/functional/r/regression/regression_2306_enum_value.txt      | 0
 tests/functional/r/regression/regression_2443_duplicate_bases.txt | 0
 tests/functional/r/regression/regression_2913.txt                 | 0
 tests/functional/r/regression/regression_2937_ifexp.txt           | 0
 tests/functional/r/regression/regression_3091.txt                 | 0
 .../r/regression/regression_3231_no_member_property.txt           | 0
 .../r/regression/regression_3507_typing_alias_isinstance.txt      | 0
 .../r/regression/regression_3535_double_enum_inherit.txt          | 0
 .../r/regression/regression_3595_notcallable_collections.txt      | 0
 .../r/regression/regression_4221_object_instanceattr.txt          | 0
 .../r/regression/regression_4358_unsubscriptable_enum.txt         | 0
 .../r/regression/regression_4612_crash_pytest_fixture.txt         | 0
 tests/functional/r/regression/regression_4891.txt                 | 0
 tests/functional/r/regression/regression_issue_4631.txt           | 0
 tests/functional/r/regression/regression_issue_4633.txt           | 0
 tests/functional/r/regression/regression_no_member_1078.txt       | 0
 .../functional/r/regression/regression_no_value_for_parameter.txt | 0
 tests/functional/r/regression/regression_posonly_args.txt         | 0
 .../r/regression/regression_property_no_member_2641.txt           | 0
 .../r/regression/regression_property_no_member_3269.txt           | 0
 .../functional/r/regression/regression_property_no_member_844.txt | 0
 .../functional/r/regression/regression_property_no_member_870.txt | 0
 tests/functional/r/regression/regression_property_slots_2439.txt  | 0
 tests/functional/r/regression_02/regression_4982.txt              | 0
 tests/functional/r/regression_02/regression_5030.txt              | 0
 tests/functional/r/regression_02/regression_5048.txt              | 0
 tests/functional/r/regression_02/regression_5244.txt              | 0
 tests/functional/r/regression_02/regression_5461.txt              | 0
 tests/functional/r/regression_02/regression_node_statement.txt    | 0
 .../functional/r/regression_02/regression_node_statement_two.txt  | 0
 .../r/regression_02/regression_too_many_arguments_2335.txt        | 0
 tests/functional/s/socketerror_import.txt                         | 0
 tests/functional/s/string/string_formatting_failed_inference.txt  | 0
 .../s/string/string_formatting_failed_inference_py35.txt          | 0
 tests/functional/s/super/super_init_not_called_py38.txt           | 0
 tests/functional/s/symlink/_binding/symlink_module.txt            | 0
 tests/functional/s/symlink/symlink_module/symlink_module.txt      | 0
 tests/functional/t/test_compile.txt                               | 0
 tests/functional/t/too/too_few_public_methods_37.txt              | 0
 tests/functional/t/too/too_many_arguments_issue_1045.txt          | 0
 tests/functional/t/too/too_many_arguments_overload.txt            | 0
 tests/functional/t/too/too_many_function_args.txt                 | 0
 tests/functional/t/too/too_many_instance_attributes_py37.txt      | 0
 tests/functional/t/too/too_many_lines_disabled.txt                | 0
 tests/functional/t/typedDict.txt                                  | 0
 tests/functional/t/typing_generic.txt                             | 0
 tests/functional/u/unbalanced_tuple_unpacking_py30.txt            | 0
 tests/functional/u/undefined/undefined_variable_classes.txt       | 0
 .../u/undefined/undefined_variable_crash_on_attribute.txt         | 0
 tests/functional/u/undefined/undefined_variable_decorators.txt    | 0
 tests/functional/u/undefined/undefined_variable_typing.txt        | 0
 tests/functional/u/ungrouped_imports_isort_compatible.txt         | 0
 tests/functional/u/uninferable_all_object.txt                     | 0
 tests/functional/u/unpacking/unpacking.txt                        | 0
 tests/functional/u/unpacking/unpacking_non_sequence_py37.txt      | 0
 tests/functional/u/unsubscriptable_object.txt                     | 0
 tests/functional/u/unused/unused_global_variable1.txt             | 0
 tests/functional/u/unused/unused_global_variable3.txt             | 0
 tests/functional/u/unused/unused_import_assigned_to.txt           | 0
 tests/functional/u/unused/unused_import_class_def_keyword.txt     | 0
 tests/functional/u/unused/unused_import_everything_disabled.txt   | 0
 tests/functional/u/unused/unused_import_positional_only_py38.txt  | 0
 tests/functional/u/unused/unused_module.txt                       | 0
 tests/functional/u/unused/unused_typing_imports.txt               | 0
 tests/functional/u/unused/unused_variable_py36.txt                | 0
 ..._before_assignment_except_handler_for_try_with_return_py38.txt | 0
 tests/functional/u/used/used_before_assignment_488.txt            | 0
 .../u/used/used_before_assignment_filtered_comprehension.txt      | 0
 tests/functional/u/used/used_before_assignment_issue853.txt       | 0
 tests/functional/u/useless/useless_suppression.txt                | 0
 tests/functional/w/wrong_import_order2.txt                        | 0
 tests/functional/w/wrong_import_position10.txt                    | 0
 tests/functional/w/wrong_import_position15.txt                    | 0
 tests/functional/w/wrong_import_position2.txt                     | 0
 tests/functional/w/wrong_import_position3.txt                     | 0
 tests/functional/w/wrong_import_position4.txt                     | 0
 tests/functional/w/wrong_import_position5.txt                     | 0
 tests/functional/w/wrong_import_position6.txt                     | 0
 tests/functional/w/wrong_import_position7.txt                     | 0
 tests/functional/w/wrong_import_position8.txt                     | 0
 tests/functional/w/wrong_import_position9.txt                     | 0
 tests/functional/w/wrong_import_position_exclude_dunder_main.txt  | 0
 tests/functional/y/yield_assign.txt                               | 0
 tests/functional/y/yield_return_mix.txt                           | 0
 194 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 tests/functional/a/abstract/abstract_abc_methods.txt
 delete mode 100644 tests/functional/a/abstract/abstract_class_instantiated_in_class.txt
 delete mode 100644 tests/functional/a/access/access_attr_before_def_false_positive.txt
 delete mode 100644 tests/functional/a/access/access_to_protected_members_typing.txt
 delete mode 100644 tests/functional/a/alternative/alternative_union_syntax.txt
 delete mode 100644 tests/functional/a/arguments_differ_issue5371.txt
 delete mode 100644 tests/functional/a/assignment/assignment_from_no_return_py3.txt
 delete mode 100644 tests/functional/b/bad_reversed_sequence_py38.txt
 delete mode 100644 tests/functional/b/base_init_vars.txt
 delete mode 100644 tests/functional/b/bugfix_local_scope_metaclass_1177.txt
 delete mode 100644 tests/functional/b/builtin_module_test.txt
 delete mode 100644 tests/functional/c/class_attributes.txt
 delete mode 100644 tests/functional/c/class_members.txt
 delete mode 100644 tests/functional/c/class_protocol_ellipsis.txt
 delete mode 100644 tests/functional/c/class_variable_slots_conflict_exempted.txt
 delete mode 100644 tests/functional/c/classes_meth_could_be_a_function.txt
 delete mode 100644 tests/functional/c/classes_protected_member_access.txt
 delete mode 100644 tests/functional/c/comparison_with_callable_typing_constants.txt
 delete mode 100644 tests/functional/c/consider/consider_using_sys_exit_exempted.txt
 delete mode 100644 tests/functional/c/consider/consider_using_sys_exit_local_scope.txt
 delete mode 100644 tests/functional/c/control_pragmas.txt
 delete mode 100644 tests/functional/c/crash_missing_module_type.txt
 delete mode 100644 tests/functional/d/decorator_scope.txt
 delete mode 100644 tests/functional/d/decorator_unused.txt
 delete mode 100644 tests/functional/d/defined_and_used_on_same_line.txt
 delete mode 100644 tests/functional/d/deprecated/deprecated_method_suppression.txt
 delete mode 100644 tests/functional/d/disable_msg_github_issue_1389.txt
 delete mode 100644 tests/functional/d/disable_wrong_import_position.txt
 delete mode 100644 tests/functional/d/disabled_msgid_in_pylintrc.txt
 delete mode 100644 tests/functional/e/.#emacs_file_lock.txt
 delete mode 100644 tests/functional/e/.#emacs_file_lock_by_conf.txt
 delete mode 100644 tests/functional/e/e1101_9588_base_attr_aug_assign.txt
 delete mode 100644 tests/functional/e/enum_subclasses.txt
 delete mode 100644 tests/functional/e/external_classmethod_crash.txt
 delete mode 100644 tests/functional/ext/code_style/cs_py_version_35.txt
 delete mode 100644 tests/functional/ext/docparams/parameter/missing_param_doc.txt
 delete mode 100644 tests/functional/ext/docparams/parameter/missing_param_doc_required_min_length.txt
 delete mode 100644 tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_check_none.txt
 delete mode 100644 tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_default.txt
 delete mode 100644 tests/functional/ext/docparams/raise/missing_raises_doc_required_Google.txt
 delete mode 100644 tests/functional/ext/docparams/raise/missing_raises_doc_required_Numpy.txt
 delete mode 100644 tests/functional/ext/docparams/raise/missing_raises_doc_required_Sphinx.txt
 delete mode 100644 tests/functional/ext/docparams/return/missing_return_doc.txt
 delete mode 100644 tests/functional/ext/docparams/yield/missing_yield_doc.txt
 delete mode 100644 tests/functional/ext/docparams/yield/missing_yield_doc_Sphinx.txt
 delete mode 100644 tests/functional/ext/typing/typing_broken_callable_deprecated_alias.txt
 delete mode 100644 tests/functional/ext/typing/typing_broken_noreturn_py372.txt
 delete mode 100644 tests/functional/f/fallback_import_disabled.txt
 delete mode 100644 tests/functional/f/formatted_string_literal_with_if.txt
 delete mode 100644 tests/functional/f/function_redefined_2540.txt
 delete mode 100644 tests/functional/f/future_import.txt
 delete mode 100644 tests/functional/g/genexp_in_class_scope.txt
 delete mode 100644 tests/functional/i/implicit/implicit_str_concat_utf8.txt
 delete mode 100644 tests/functional/i/init_return_from_inner_function.txt
 delete mode 100644 tests/functional/i/init_subclass_classmethod.txt
 delete mode 100644 tests/functional/i/inner_classes.txt
 delete mode 100644 tests/functional/i/invalid/invalid_all_format_valid_1.txt
 delete mode 100644 tests/functional/i/invalid/invalid_all_format_valid_2.txt
 delete mode 100644 tests/functional/i/invalid/invalid_all_format_valid_3.txt
 delete mode 100644 tests/functional/i/invalid/invalid_all_format_valid_4.txt
 delete mode 100644 tests/functional/i/invalid/invalid_all_format_valid_5.txt
 delete mode 100644 tests/functional/i/invalid/invalid_all_format_valid_6.txt
 delete mode 100644 tests/functional/i/invalid/invalid_metaclass_py3.txt
 delete mode 100644 tests/functional/l/lambda_use_before_assign.txt
 delete mode 100644 tests/functional/l/line_too_long_end_of_module.txt
 delete mode 100644 tests/functional/l/logging_format_interpolation_style.txt
 delete mode 100644 tests/functional/l/long_utf8_lines.txt
 delete mode 100644 tests/functional/m/member/member_checks_inference_improvements.txt
 delete mode 100644 tests/functional/m/metaclass_attr_access.txt
 delete mode 100644 tests/functional/m/missing/missing_module_docstring_disabled.txt
 delete mode 100644 tests/functional/m/missing/missing_module_docstring_empty.txt
 delete mode 100644 tests/functional/m/monkeypatch_method.txt
 delete mode 100644 tests/functional/n/no/no_member.txt
 delete mode 100644 tests/functional/n/no/no_member_nested_namedtuple.txt
 delete mode 100644 tests/functional/n/no/no_member_subclassed_dataclasses.txt
 delete mode 100644 tests/functional/n/no/no_method_argument_py38.txt
 delete mode 100644 tests/functional/n/no/no_self_use_py3.txt
 delete mode 100644 tests/functional/n/no/no_warning_docstring.txt
 delete mode 100644 tests/functional/n/non/non_ascii_name_backward_test_code.txt
 delete mode 100644 tests/functional/n/non/non_ascii_name_backward_test_msg.txt
 delete mode 100644 tests/functional/n/non/non_parent_init_called.txt
 delete mode 100644 tests/functional/n/non_ascii_import/non_ascii_import.txt
 delete mode 100644 tests/functional/n/non_ascii_import/non_ascii_import_as_okay.txt
 delete mode 100644 tests/functional/n/non_ascii_name/non_ascii_name_dict_kwargs.txt
 delete mode 100644 tests/functional/n/not_async_context_manager_py37.txt
 delete mode 100644 tests/functional/o/object_as_class_attribute.txt
 delete mode 100644 tests/functional/o/old_division_floats.txt
 delete mode 100644 tests/functional/o/old_division_manually.txt
 delete mode 100644 tests/functional/o/overloaded_operator.txt
 delete mode 100644 tests/functional/p/pattern_matching.txt
 delete mode 100644 tests/functional/p/postponed_evaluation_activated.txt
 delete mode 100644 tests/functional/p/postponed_evaluation_activated_with_alias.txt
 delete mode 100644 tests/functional/p/pragma_after_backslash.txt
 delete mode 100644 tests/functional/p/property_affectation_py26.txt
 delete mode 100644 tests/functional/p/py_version_35.txt
 delete mode 100644 tests/functional/r/raising/raising_self.txt
 delete mode 100644 tests/functional/r/recursion/recursion_error_2667.txt
 delete mode 100644 tests/functional/r/recursion/recursion_error_2836.txt
 delete mode 100644 tests/functional/r/recursion/recursion_error_2861.txt
 delete mode 100644 tests/functional/r/recursion/recursion_error_2899.txt
 delete mode 100644 tests/functional/r/recursion/recursion_error_2906.txt
 delete mode 100644 tests/functional/r/recursion/recursion_error_3152.txt
 delete mode 100644 tests/functional/r/recursion/recursion_error_3159.txt
 delete mode 100644 tests/functional/r/recursion/recursion_error_940.txt
 delete mode 100644 tests/functional/r/recursion/recursion_error_crash.txt
 delete mode 100644 tests/functional/r/recursion/recursion_error_crash_2683.txt
 delete mode 100644 tests/functional/r/recursion/recursion_error_crash_astroid_623.txt
 delete mode 100644 tests/functional/r/recursion/recursion_regression_2960.txt
 delete mode 100644 tests/functional/r/redefined/redefined_outer_name_type_checking.txt
 delete mode 100644 tests/functional/r/regression/regression_1326_crash_uninferable.txt
 delete mode 100644 tests/functional/r/regression/regression_2306_enum_value.txt
 delete mode 100644 tests/functional/r/regression/regression_2443_duplicate_bases.txt
 delete mode 100644 tests/functional/r/regression/regression_2913.txt
 delete mode 100644 tests/functional/r/regression/regression_2937_ifexp.txt
 delete mode 100644 tests/functional/r/regression/regression_3091.txt
 delete mode 100644 tests/functional/r/regression/regression_3231_no_member_property.txt
 delete mode 100644 tests/functional/r/regression/regression_3507_typing_alias_isinstance.txt
 delete mode 100644 tests/functional/r/regression/regression_3535_double_enum_inherit.txt
 delete mode 100644 tests/functional/r/regression/regression_3595_notcallable_collections.txt
 delete mode 100644 tests/functional/r/regression/regression_4221_object_instanceattr.txt
 delete mode 100644 tests/functional/r/regression/regression_4358_unsubscriptable_enum.txt
 delete mode 100644 tests/functional/r/regression/regression_4612_crash_pytest_fixture.txt
 delete mode 100644 tests/functional/r/regression/regression_4891.txt
 delete mode 100644 tests/functional/r/regression/regression_issue_4631.txt
 delete mode 100644 tests/functional/r/regression/regression_issue_4633.txt
 delete mode 100644 tests/functional/r/regression/regression_no_member_1078.txt
 delete mode 100644 tests/functional/r/regression/regression_no_value_for_parameter.txt
 delete mode 100644 tests/functional/r/regression/regression_posonly_args.txt
 delete mode 100644 tests/functional/r/regression/regression_property_no_member_2641.txt
 delete mode 100644 tests/functional/r/regression/regression_property_no_member_3269.txt
 delete mode 100644 tests/functional/r/regression/regression_property_no_member_844.txt
 delete mode 100644 tests/functional/r/regression/regression_property_no_member_870.txt
 delete mode 100644 tests/functional/r/regression/regression_property_slots_2439.txt
 delete mode 100644 tests/functional/r/regression_02/regression_4982.txt
 delete mode 100644 tests/functional/r/regression_02/regression_5030.txt
 delete mode 100644 tests/functional/r/regression_02/regression_5048.txt
 delete mode 100644 tests/functional/r/regression_02/regression_5244.txt
 delete mode 100644 tests/functional/r/regression_02/regression_5461.txt
 delete mode 100644 tests/functional/r/regression_02/regression_node_statement.txt
 delete mode 100644 tests/functional/r/regression_02/regression_node_statement_two.txt
 delete mode 100644 tests/functional/r/regression_02/regression_too_many_arguments_2335.txt
 delete mode 100644 tests/functional/s/socketerror_import.txt
 delete mode 100644 tests/functional/s/string/string_formatting_failed_inference.txt
 delete mode 100644 tests/functional/s/string/string_formatting_failed_inference_py35.txt
 delete mode 100644 tests/functional/s/super/super_init_not_called_py38.txt
 delete mode 100644 tests/functional/s/symlink/_binding/symlink_module.txt
 delete mode 100644 tests/functional/s/symlink/symlink_module/symlink_module.txt
 delete mode 100644 tests/functional/t/test_compile.txt
 delete mode 100644 tests/functional/t/too/too_few_public_methods_37.txt
 delete mode 100644 tests/functional/t/too/too_many_arguments_issue_1045.txt
 delete mode 100644 tests/functional/t/too/too_many_arguments_overload.txt
 delete mode 100644 tests/functional/t/too/too_many_function_args.txt
 delete mode 100644 tests/functional/t/too/too_many_instance_attributes_py37.txt
 delete mode 100644 tests/functional/t/too/too_many_lines_disabled.txt
 delete mode 100644 tests/functional/t/typedDict.txt
 delete mode 100644 tests/functional/t/typing_generic.txt
 delete mode 100644 tests/functional/u/unbalanced_tuple_unpacking_py30.txt
 delete mode 100644 tests/functional/u/undefined/undefined_variable_classes.txt
 delete mode 100644 tests/functional/u/undefined/undefined_variable_crash_on_attribute.txt
 delete mode 100644 tests/functional/u/undefined/undefined_variable_decorators.txt
 delete mode 100644 tests/functional/u/undefined/undefined_variable_typing.txt
 delete mode 100644 tests/functional/u/ungrouped_imports_isort_compatible.txt
 delete mode 100644 tests/functional/u/uninferable_all_object.txt
 delete mode 100644 tests/functional/u/unpacking/unpacking.txt
 delete mode 100644 tests/functional/u/unpacking/unpacking_non_sequence_py37.txt
 delete mode 100644 tests/functional/u/unsubscriptable_object.txt
 delete mode 100644 tests/functional/u/unused/unused_global_variable1.txt
 delete mode 100644 tests/functional/u/unused/unused_global_variable3.txt
 delete mode 100644 tests/functional/u/unused/unused_import_assigned_to.txt
 delete mode 100644 tests/functional/u/unused/unused_import_class_def_keyword.txt
 delete mode 100644 tests/functional/u/unused/unused_import_everything_disabled.txt
 delete mode 100644 tests/functional/u/unused/unused_import_positional_only_py38.txt
 delete mode 100644 tests/functional/u/unused/unused_module.txt
 delete mode 100644 tests/functional/u/unused/unused_typing_imports.txt
 delete mode 100644 tests/functional/u/unused/unused_variable_py36.txt
 delete mode 100644 tests/functional/u/use/used_before_assignment_except_handler_for_try_with_return_py38.txt
 delete mode 100644 tests/functional/u/used/used_before_assignment_488.txt
 delete mode 100644 tests/functional/u/used/used_before_assignment_filtered_comprehension.txt
 delete mode 100644 tests/functional/u/used/used_before_assignment_issue853.txt
 delete mode 100644 tests/functional/u/useless/useless_suppression.txt
 delete mode 100644 tests/functional/w/wrong_import_order2.txt
 delete mode 100644 tests/functional/w/wrong_import_position10.txt
 delete mode 100644 tests/functional/w/wrong_import_position15.txt
 delete mode 100644 tests/functional/w/wrong_import_position2.txt
 delete mode 100644 tests/functional/w/wrong_import_position3.txt
 delete mode 100644 tests/functional/w/wrong_import_position4.txt
 delete mode 100644 tests/functional/w/wrong_import_position5.txt
 delete mode 100644 tests/functional/w/wrong_import_position6.txt
 delete mode 100644 tests/functional/w/wrong_import_position7.txt
 delete mode 100644 tests/functional/w/wrong_import_position8.txt
 delete mode 100644 tests/functional/w/wrong_import_position9.txt
 delete mode 100644 tests/functional/w/wrong_import_position_exclude_dunder_main.txt
 delete mode 100644 tests/functional/y/yield_assign.txt
 delete mode 100644 tests/functional/y/yield_return_mix.txt

diff --git a/tests/functional/a/abstract/abstract_abc_methods.txt b/tests/functional/a/abstract/abstract_abc_methods.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/a/abstract/abstract_class_instantiated_in_class.txt b/tests/functional/a/abstract/abstract_class_instantiated_in_class.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/a/access/access_attr_before_def_false_positive.txt b/tests/functional/a/access/access_attr_before_def_false_positive.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/a/access/access_to_protected_members_typing.txt b/tests/functional/a/access/access_to_protected_members_typing.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/a/alternative/alternative_union_syntax.txt b/tests/functional/a/alternative/alternative_union_syntax.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/a/arguments_differ_issue5371.txt b/tests/functional/a/arguments_differ_issue5371.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/a/assignment/assignment_from_no_return_py3.txt b/tests/functional/a/assignment/assignment_from_no_return_py3.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/b/bad_reversed_sequence_py38.txt b/tests/functional/b/bad_reversed_sequence_py38.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/b/base_init_vars.txt b/tests/functional/b/base_init_vars.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/b/bugfix_local_scope_metaclass_1177.txt b/tests/functional/b/bugfix_local_scope_metaclass_1177.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/b/builtin_module_test.txt b/tests/functional/b/builtin_module_test.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/c/class_attributes.txt b/tests/functional/c/class_attributes.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/c/class_members.txt b/tests/functional/c/class_members.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/c/class_protocol_ellipsis.txt b/tests/functional/c/class_protocol_ellipsis.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/c/class_variable_slots_conflict_exempted.txt b/tests/functional/c/class_variable_slots_conflict_exempted.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/c/classes_meth_could_be_a_function.txt b/tests/functional/c/classes_meth_could_be_a_function.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/c/classes_protected_member_access.txt b/tests/functional/c/classes_protected_member_access.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/c/comparison_with_callable_typing_constants.txt b/tests/functional/c/comparison_with_callable_typing_constants.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/c/consider/consider_using_sys_exit_exempted.txt b/tests/functional/c/consider/consider_using_sys_exit_exempted.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/c/consider/consider_using_sys_exit_local_scope.txt b/tests/functional/c/consider/consider_using_sys_exit_local_scope.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/c/control_pragmas.txt b/tests/functional/c/control_pragmas.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/c/crash_missing_module_type.txt b/tests/functional/c/crash_missing_module_type.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/d/decorator_scope.txt b/tests/functional/d/decorator_scope.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/d/decorator_unused.txt b/tests/functional/d/decorator_unused.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/d/defined_and_used_on_same_line.txt b/tests/functional/d/defined_and_used_on_same_line.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/d/deprecated/deprecated_method_suppression.txt b/tests/functional/d/deprecated/deprecated_method_suppression.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/d/disable_msg_github_issue_1389.txt b/tests/functional/d/disable_msg_github_issue_1389.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/d/disable_wrong_import_position.txt b/tests/functional/d/disable_wrong_import_position.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/d/disabled_msgid_in_pylintrc.txt b/tests/functional/d/disabled_msgid_in_pylintrc.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/e/.#emacs_file_lock.txt b/tests/functional/e/.#emacs_file_lock.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/e/.#emacs_file_lock_by_conf.txt b/tests/functional/e/.#emacs_file_lock_by_conf.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/e/e1101_9588_base_attr_aug_assign.txt b/tests/functional/e/e1101_9588_base_attr_aug_assign.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/e/enum_subclasses.txt b/tests/functional/e/enum_subclasses.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/e/external_classmethod_crash.txt b/tests/functional/e/external_classmethod_crash.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/ext/code_style/cs_py_version_35.txt b/tests/functional/ext/code_style/cs_py_version_35.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/ext/docparams/parameter/missing_param_doc.txt b/tests/functional/ext/docparams/parameter/missing_param_doc.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/ext/docparams/parameter/missing_param_doc_required_min_length.txt b/tests/functional/ext/docparams/parameter/missing_param_doc_required_min_length.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_check_none.txt b/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_check_none.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_default.txt b/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_default.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/ext/docparams/raise/missing_raises_doc_required_Google.txt b/tests/functional/ext/docparams/raise/missing_raises_doc_required_Google.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/ext/docparams/raise/missing_raises_doc_required_Numpy.txt b/tests/functional/ext/docparams/raise/missing_raises_doc_required_Numpy.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/ext/docparams/raise/missing_raises_doc_required_Sphinx.txt b/tests/functional/ext/docparams/raise/missing_raises_doc_required_Sphinx.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/ext/docparams/return/missing_return_doc.txt b/tests/functional/ext/docparams/return/missing_return_doc.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/ext/docparams/yield/missing_yield_doc.txt b/tests/functional/ext/docparams/yield/missing_yield_doc.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/ext/docparams/yield/missing_yield_doc_Sphinx.txt b/tests/functional/ext/docparams/yield/missing_yield_doc_Sphinx.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/ext/typing/typing_broken_callable_deprecated_alias.txt b/tests/functional/ext/typing/typing_broken_callable_deprecated_alias.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/ext/typing/typing_broken_noreturn_py372.txt b/tests/functional/ext/typing/typing_broken_noreturn_py372.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/f/fallback_import_disabled.txt b/tests/functional/f/fallback_import_disabled.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/f/formatted_string_literal_with_if.txt b/tests/functional/f/formatted_string_literal_with_if.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/f/function_redefined_2540.txt b/tests/functional/f/function_redefined_2540.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/f/future_import.txt b/tests/functional/f/future_import.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/g/genexp_in_class_scope.txt b/tests/functional/g/genexp_in_class_scope.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/i/implicit/implicit_str_concat_utf8.txt b/tests/functional/i/implicit/implicit_str_concat_utf8.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/i/init_return_from_inner_function.txt b/tests/functional/i/init_return_from_inner_function.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/i/init_subclass_classmethod.txt b/tests/functional/i/init_subclass_classmethod.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/i/inner_classes.txt b/tests/functional/i/inner_classes.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/i/invalid/invalid_all_format_valid_1.txt b/tests/functional/i/invalid/invalid_all_format_valid_1.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/i/invalid/invalid_all_format_valid_2.txt b/tests/functional/i/invalid/invalid_all_format_valid_2.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/i/invalid/invalid_all_format_valid_3.txt b/tests/functional/i/invalid/invalid_all_format_valid_3.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/i/invalid/invalid_all_format_valid_4.txt b/tests/functional/i/invalid/invalid_all_format_valid_4.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/i/invalid/invalid_all_format_valid_5.txt b/tests/functional/i/invalid/invalid_all_format_valid_5.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/i/invalid/invalid_all_format_valid_6.txt b/tests/functional/i/invalid/invalid_all_format_valid_6.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/i/invalid/invalid_metaclass_py3.txt b/tests/functional/i/invalid/invalid_metaclass_py3.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/l/lambda_use_before_assign.txt b/tests/functional/l/lambda_use_before_assign.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/l/line_too_long_end_of_module.txt b/tests/functional/l/line_too_long_end_of_module.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/l/logging_format_interpolation_style.txt b/tests/functional/l/logging_format_interpolation_style.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/l/long_utf8_lines.txt b/tests/functional/l/long_utf8_lines.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/m/member/member_checks_inference_improvements.txt b/tests/functional/m/member/member_checks_inference_improvements.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/m/metaclass_attr_access.txt b/tests/functional/m/metaclass_attr_access.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/m/missing/missing_module_docstring_disabled.txt b/tests/functional/m/missing/missing_module_docstring_disabled.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/m/missing/missing_module_docstring_empty.txt b/tests/functional/m/missing/missing_module_docstring_empty.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/m/monkeypatch_method.txt b/tests/functional/m/monkeypatch_method.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/n/no/no_member.txt b/tests/functional/n/no/no_member.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/n/no/no_member_nested_namedtuple.txt b/tests/functional/n/no/no_member_nested_namedtuple.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/n/no/no_member_subclassed_dataclasses.txt b/tests/functional/n/no/no_member_subclassed_dataclasses.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/n/no/no_method_argument_py38.txt b/tests/functional/n/no/no_method_argument_py38.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/n/no/no_self_use_py3.txt b/tests/functional/n/no/no_self_use_py3.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/n/no/no_warning_docstring.txt b/tests/functional/n/no/no_warning_docstring.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/n/non/non_ascii_name_backward_test_code.txt b/tests/functional/n/non/non_ascii_name_backward_test_code.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/n/non/non_ascii_name_backward_test_msg.txt b/tests/functional/n/non/non_ascii_name_backward_test_msg.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/n/non/non_parent_init_called.txt b/tests/functional/n/non/non_parent_init_called.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/n/non_ascii_import/non_ascii_import.txt b/tests/functional/n/non_ascii_import/non_ascii_import.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/n/non_ascii_import/non_ascii_import_as_okay.txt b/tests/functional/n/non_ascii_import/non_ascii_import_as_okay.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/n/non_ascii_name/non_ascii_name_dict_kwargs.txt b/tests/functional/n/non_ascii_name/non_ascii_name_dict_kwargs.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/n/not_async_context_manager_py37.txt b/tests/functional/n/not_async_context_manager_py37.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/o/object_as_class_attribute.txt b/tests/functional/o/object_as_class_attribute.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/o/old_division_floats.txt b/tests/functional/o/old_division_floats.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/o/old_division_manually.txt b/tests/functional/o/old_division_manually.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/o/overloaded_operator.txt b/tests/functional/o/overloaded_operator.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/p/pattern_matching.txt b/tests/functional/p/pattern_matching.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/p/postponed_evaluation_activated.txt b/tests/functional/p/postponed_evaluation_activated.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/p/postponed_evaluation_activated_with_alias.txt b/tests/functional/p/postponed_evaluation_activated_with_alias.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/p/pragma_after_backslash.txt b/tests/functional/p/pragma_after_backslash.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/p/property_affectation_py26.txt b/tests/functional/p/property_affectation_py26.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/p/py_version_35.txt b/tests/functional/p/py_version_35.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/raising/raising_self.txt b/tests/functional/r/raising/raising_self.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/recursion/recursion_error_2667.txt b/tests/functional/r/recursion/recursion_error_2667.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/recursion/recursion_error_2836.txt b/tests/functional/r/recursion/recursion_error_2836.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/recursion/recursion_error_2861.txt b/tests/functional/r/recursion/recursion_error_2861.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/recursion/recursion_error_2899.txt b/tests/functional/r/recursion/recursion_error_2899.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/recursion/recursion_error_2906.txt b/tests/functional/r/recursion/recursion_error_2906.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/recursion/recursion_error_3152.txt b/tests/functional/r/recursion/recursion_error_3152.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/recursion/recursion_error_3159.txt b/tests/functional/r/recursion/recursion_error_3159.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/recursion/recursion_error_940.txt b/tests/functional/r/recursion/recursion_error_940.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/recursion/recursion_error_crash.txt b/tests/functional/r/recursion/recursion_error_crash.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/recursion/recursion_error_crash_2683.txt b/tests/functional/r/recursion/recursion_error_crash_2683.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/recursion/recursion_error_crash_astroid_623.txt b/tests/functional/r/recursion/recursion_error_crash_astroid_623.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/recursion/recursion_regression_2960.txt b/tests/functional/r/recursion/recursion_regression_2960.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/redefined/redefined_outer_name_type_checking.txt b/tests/functional/r/redefined/redefined_outer_name_type_checking.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/regression/regression_1326_crash_uninferable.txt b/tests/functional/r/regression/regression_1326_crash_uninferable.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/regression/regression_2306_enum_value.txt b/tests/functional/r/regression/regression_2306_enum_value.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/regression/regression_2443_duplicate_bases.txt b/tests/functional/r/regression/regression_2443_duplicate_bases.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/regression/regression_2913.txt b/tests/functional/r/regression/regression_2913.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/regression/regression_2937_ifexp.txt b/tests/functional/r/regression/regression_2937_ifexp.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/regression/regression_3091.txt b/tests/functional/r/regression/regression_3091.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/regression/regression_3231_no_member_property.txt b/tests/functional/r/regression/regression_3231_no_member_property.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/regression/regression_3507_typing_alias_isinstance.txt b/tests/functional/r/regression/regression_3507_typing_alias_isinstance.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/regression/regression_3535_double_enum_inherit.txt b/tests/functional/r/regression/regression_3535_double_enum_inherit.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/regression/regression_3595_notcallable_collections.txt b/tests/functional/r/regression/regression_3595_notcallable_collections.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/regression/regression_4221_object_instanceattr.txt b/tests/functional/r/regression/regression_4221_object_instanceattr.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/regression/regression_4358_unsubscriptable_enum.txt b/tests/functional/r/regression/regression_4358_unsubscriptable_enum.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/regression/regression_4612_crash_pytest_fixture.txt b/tests/functional/r/regression/regression_4612_crash_pytest_fixture.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/regression/regression_4891.txt b/tests/functional/r/regression/regression_4891.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/regression/regression_issue_4631.txt b/tests/functional/r/regression/regression_issue_4631.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/regression/regression_issue_4633.txt b/tests/functional/r/regression/regression_issue_4633.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/regression/regression_no_member_1078.txt b/tests/functional/r/regression/regression_no_member_1078.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/regression/regression_no_value_for_parameter.txt b/tests/functional/r/regression/regression_no_value_for_parameter.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/regression/regression_posonly_args.txt b/tests/functional/r/regression/regression_posonly_args.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/regression/regression_property_no_member_2641.txt b/tests/functional/r/regression/regression_property_no_member_2641.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/regression/regression_property_no_member_3269.txt b/tests/functional/r/regression/regression_property_no_member_3269.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/regression/regression_property_no_member_844.txt b/tests/functional/r/regression/regression_property_no_member_844.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/regression/regression_property_no_member_870.txt b/tests/functional/r/regression/regression_property_no_member_870.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/regression/regression_property_slots_2439.txt b/tests/functional/r/regression/regression_property_slots_2439.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/regression_02/regression_4982.txt b/tests/functional/r/regression_02/regression_4982.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/regression_02/regression_5030.txt b/tests/functional/r/regression_02/regression_5030.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/regression_02/regression_5048.txt b/tests/functional/r/regression_02/regression_5048.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/regression_02/regression_5244.txt b/tests/functional/r/regression_02/regression_5244.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/regression_02/regression_5461.txt b/tests/functional/r/regression_02/regression_5461.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/regression_02/regression_node_statement.txt b/tests/functional/r/regression_02/regression_node_statement.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/regression_02/regression_node_statement_two.txt b/tests/functional/r/regression_02/regression_node_statement_two.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/r/regression_02/regression_too_many_arguments_2335.txt b/tests/functional/r/regression_02/regression_too_many_arguments_2335.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/s/socketerror_import.txt b/tests/functional/s/socketerror_import.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/s/string/string_formatting_failed_inference.txt b/tests/functional/s/string/string_formatting_failed_inference.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/s/string/string_formatting_failed_inference_py35.txt b/tests/functional/s/string/string_formatting_failed_inference_py35.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/s/super/super_init_not_called_py38.txt b/tests/functional/s/super/super_init_not_called_py38.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/s/symlink/_binding/symlink_module.txt b/tests/functional/s/symlink/_binding/symlink_module.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/s/symlink/symlink_module/symlink_module.txt b/tests/functional/s/symlink/symlink_module/symlink_module.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/t/test_compile.txt b/tests/functional/t/test_compile.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/t/too/too_few_public_methods_37.txt b/tests/functional/t/too/too_few_public_methods_37.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/t/too/too_many_arguments_issue_1045.txt b/tests/functional/t/too/too_many_arguments_issue_1045.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/t/too/too_many_arguments_overload.txt b/tests/functional/t/too/too_many_arguments_overload.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/t/too/too_many_function_args.txt b/tests/functional/t/too/too_many_function_args.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/t/too/too_many_instance_attributes_py37.txt b/tests/functional/t/too/too_many_instance_attributes_py37.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/t/too/too_many_lines_disabled.txt b/tests/functional/t/too/too_many_lines_disabled.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/t/typedDict.txt b/tests/functional/t/typedDict.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/t/typing_generic.txt b/tests/functional/t/typing_generic.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/u/unbalanced_tuple_unpacking_py30.txt b/tests/functional/u/unbalanced_tuple_unpacking_py30.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/u/undefined/undefined_variable_classes.txt b/tests/functional/u/undefined/undefined_variable_classes.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/u/undefined/undefined_variable_crash_on_attribute.txt b/tests/functional/u/undefined/undefined_variable_crash_on_attribute.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/u/undefined/undefined_variable_decorators.txt b/tests/functional/u/undefined/undefined_variable_decorators.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/u/undefined/undefined_variable_typing.txt b/tests/functional/u/undefined/undefined_variable_typing.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/u/ungrouped_imports_isort_compatible.txt b/tests/functional/u/ungrouped_imports_isort_compatible.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/u/uninferable_all_object.txt b/tests/functional/u/uninferable_all_object.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/u/unpacking/unpacking.txt b/tests/functional/u/unpacking/unpacking.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/u/unpacking/unpacking_non_sequence_py37.txt b/tests/functional/u/unpacking/unpacking_non_sequence_py37.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/u/unsubscriptable_object.txt b/tests/functional/u/unsubscriptable_object.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/u/unused/unused_global_variable1.txt b/tests/functional/u/unused/unused_global_variable1.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/u/unused/unused_global_variable3.txt b/tests/functional/u/unused/unused_global_variable3.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/u/unused/unused_import_assigned_to.txt b/tests/functional/u/unused/unused_import_assigned_to.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/u/unused/unused_import_class_def_keyword.txt b/tests/functional/u/unused/unused_import_class_def_keyword.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/u/unused/unused_import_everything_disabled.txt b/tests/functional/u/unused/unused_import_everything_disabled.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/u/unused/unused_import_positional_only_py38.txt b/tests/functional/u/unused/unused_import_positional_only_py38.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/u/unused/unused_module.txt b/tests/functional/u/unused/unused_module.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/u/unused/unused_typing_imports.txt b/tests/functional/u/unused/unused_typing_imports.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/u/unused/unused_variable_py36.txt b/tests/functional/u/unused/unused_variable_py36.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/u/use/used_before_assignment_except_handler_for_try_with_return_py38.txt b/tests/functional/u/use/used_before_assignment_except_handler_for_try_with_return_py38.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/u/used/used_before_assignment_488.txt b/tests/functional/u/used/used_before_assignment_488.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/u/used/used_before_assignment_filtered_comprehension.txt b/tests/functional/u/used/used_before_assignment_filtered_comprehension.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/u/used/used_before_assignment_issue853.txt b/tests/functional/u/used/used_before_assignment_issue853.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/u/useless/useless_suppression.txt b/tests/functional/u/useless/useless_suppression.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/w/wrong_import_order2.txt b/tests/functional/w/wrong_import_order2.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/w/wrong_import_position10.txt b/tests/functional/w/wrong_import_position10.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/w/wrong_import_position15.txt b/tests/functional/w/wrong_import_position15.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/w/wrong_import_position2.txt b/tests/functional/w/wrong_import_position2.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/w/wrong_import_position3.txt b/tests/functional/w/wrong_import_position3.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/w/wrong_import_position4.txt b/tests/functional/w/wrong_import_position4.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/w/wrong_import_position5.txt b/tests/functional/w/wrong_import_position5.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/w/wrong_import_position6.txt b/tests/functional/w/wrong_import_position6.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/w/wrong_import_position7.txt b/tests/functional/w/wrong_import_position7.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/w/wrong_import_position8.txt b/tests/functional/w/wrong_import_position8.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/w/wrong_import_position9.txt b/tests/functional/w/wrong_import_position9.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/w/wrong_import_position_exclude_dunder_main.txt b/tests/functional/w/wrong_import_position_exclude_dunder_main.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/y/yield_assign.txt b/tests/functional/y/yield_assign.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/functional/y/yield_return_mix.txt b/tests/functional/y/yield_return_mix.txt
deleted file mode 100644
index e69de29bb2..0000000000